haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qemu-option: Fix has_help_option()'s sloppy parsing

Browse source 
has_help_option() uses its own parser.  It's inconsistent with
qemu_opts_parse(), as demonstrated by test-qemu-opts case
/qemu-opts/has_help_option.  Fix by reusing the common parser.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200415074927.19897-5-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2020-04-15 09:49:22 +02:00
parent 933d152778
commit 80a9485573
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/test-qemu-opts.c
View file

@ -749,8 +749,8 @@ static void test_has_help_option(void)
{ "a=0,?,b", true, true, true },
{ "help,b=1", true, true, false },
{ "?,b=1", true, true, false },
{ "a,b,,help", false /* BUG */, true, true },
{ "a,b,,?", false /* BUG */, true, true },
{ "a,b,,help", true, true, true },
{ "a,b,,?", true, true, true },
};
int i;
QemuOpts *opts;

39
util/qemu-option.c
View file

@ -165,26 +165,6 @@ void parse_option_size(const char *name, const char *value,
*ret = size;
}
bool has_help_option(const char *param)
{
const char *p = param;
bool result = false;
while (*p && !result) {
char *value;
p = get_opt_value(p, &value);
if (*p) {
p++;
}
result = is_help_option(value);
g_free(value);
}
return result;
}
bool is_valid_option_list(const char *p)
{
char *value = NULL;
@ -890,6 +870,25 @@ static char *opts_parse_id(const char *params)
return NULL;
}
bool has_help_option(const char *params)
{
const char *p;
char *name, *value;
bool ret;
for (p = params; *p;) {
p = get_opt_name_value(p, NULL, &name, &value);
ret = is_help_option(name);
g_free(name);
g_free(value);
if (ret) {
return true;
}
}
return false;
}
/**
* Store options parsed from @params into @opts.
* If @firstname is non-null, the first key=value in @params may omit