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

qemu-option: Fix sloppy recognition of "id=..." after ",,"

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200415074927.19897-4-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-04-15 09:49:21 +02:00
parent 6129803b55
commit 933d152778
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -500,10 +500,10 @@ static void test_opts_parse(void)
g_assert(!opts);
/* TODO Cover .merge_lists = true */
/* Buggy ID recognition */
/* Buggy ID recognition (fixed) */
opts = qemu_opts_parse(&opts_list_03, "x=,,id=bar", false, &error_abort);
g_assert_cmpuint(opts_count(opts), ==, 1);
g_assert_cmpstr(qemu_opts_id(opts), ==, "bar"); /* BUG */
g_assert(!qemu_opts_id(opts));
g_assert_cmpstr(qemu_opt_get(opts, "x"), ==, ",id=bar");
/* Anti-social ID */

27
util/qemu-option.c
View File

@ -872,6 +872,24 @@ static void opts_do_parse(QemuOpts *opts, const char *params,
}
}
static char *opts_parse_id(const char *params)
{
const char *p;
char *name, *value;
for (p = params; *p;) {
p = get_opt_name_value(p, NULL, &name, &value);
if (!strcmp(name, "id")) {
g_free(name);
return value;
}
g_free(name);
g_free(value);
}
return NULL;
}
/**
* Store options parsed from @params into @opts.
* If @firstname is non-null, the first key=value in @params may omit
@ -889,20 +907,13 @@ static QemuOpts *opts_parse(QemuOptsList *list, const char *params,
bool *invalidp, Error **errp)
{
const char *firstname;
char *id = NULL;
const char *p;
char *id = opts_parse_id(params);
QemuOpts *opts;
Error *local_err = NULL;
assert(!permit_abbrev || list->implied_opt_name);
firstname = permit_abbrev ? list->implied_opt_name : NULL;
if (strncmp(params, "id=", 3) == 0) {
get_opt_value(params + 3, &id);
} else if ((p = strstr(params, ",id=")) != NULL) {
get_opt_value(p + 4, &id);
}
/*
* This code doesn't work for defaults && !list->merge_lists: when
* params has no id=, and list has an element with !opts->id, it