mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-options: Bail out on unsupported options instead of silently ignoring them

Browse Source 
The dangling remainder of the -tdf option revealed a deficiency in our
option parsing: Options that have been declared, but are not supported
in the switch-case statement in vl.c and not handled in the OS-specifc
os_parse_cmd_args() functions are currently silently ignored. We should
rather tell the users that they specified something that we can not
handle, so let's print an error message and exit instead.

Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1525453270-23074-3-git-send-email-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Thomas Huth 2018-05-04 19:01:07 +02:00 committed by Paolo Bonzini
parent 281b95231d
commit 1217d6ca2b
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/qemu-common.h
View File

@ -137,7 +137,7 @@ char *qemu_find_file(int type, const char *name);
/* OS specific functions */ /* OS specific functions */
void os_setup_early_signal_handling(void); void os_setup_early_signal_handling(void);
char *os_find_datadir(void); char *os_find_datadir(void);
void os_parse_cmd_args(int index, const char *optarg); int os_parse_cmd_args(int index, const char *optarg);
#include "qemu/module.h" #include "qemu/module.h"

6
os-posix.c
View File

@ -165,7 +165,7 @@ static bool os_parse_runas_uid_gid(const char *optarg)
* Parse OS specific command line options. * Parse OS specific command line options.
* return 0 if option handled, -1 otherwise * return 0 if option handled, -1 otherwise
*/ */
void os_parse_cmd_args(int index, const char *optarg) int os_parse_cmd_args(int index, const char *optarg)
{ {
switch (index) { switch (index) {
#ifdef CONFIG_SLIRP #ifdef CONFIG_SLIRP
@ -199,7 +199,11 @@ void os_parse_cmd_args(int index, const char *optarg)
fips_set_state(true); fips_set_state(true);
break; break;
#endif #endif
default:
return -1;
} }
return 0;
} }
static void change_process_uid(void) static void change_process_uid(void)

4
os-win32.c
View File

@ -93,9 +93,9 @@ void os_set_line_buffering(void)
* Parse OS specific command line options. * Parse OS specific command line options.
* return 0 if option handled, -1 otherwise * return 0 if option handled, -1 otherwise
*/ */
void os_parse_cmd_args(int index, const char *optarg) int os_parse_cmd_args(int index, const char *optarg)
{ {
return; return -1;
} }
int qemu_create_pidfile(const char *filename) int qemu_create_pidfile(const char *filename)

5
vl.c
View File

@ -4033,7 +4033,10 @@ int main(int argc, char **argv, char **envp)
} }
break; break;
default: default:
os_parse_cmd_args(popt->index, optarg); if (os_parse_cmd_args(popt->index, optarg)) {
error_report("Option not supported in this build");
exit(1);
}
} }
} }
} }