mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
keyval: Restrict key components to valid QAPI names
Until now, key components are separated by '.'. This leaves little room for evolving the syntax, and is incompatible with the __RFQDN_ prefix convention for downstream extensions. Since key components will be commonly used as QAPI member names by the QObject input visitor, we can just as well borrow the QAPI naming rules here: letters, digits, hyphen and period starting with a letter, with an optional __RFQDN_ prefix for downstream extensions. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <1488317230-26248-20-git-send-email-armbru@redhat.com>
This commit is contained in:
parent
069b64e3fe
commit
f740048323
2 changed files with 18 additions and 4 deletions
|
@ -41,6 +41,11 @@ static void test_keyval_parse(void)
|
|||
error_free_or_abort(&err);
|
||||
g_assert(!qdict);
|
||||
|
||||
/* Invalid non-empty key (qemu_opts_parse() doesn't care) */
|
||||
qdict = keyval_parse("7up=val", NULL, &err);
|
||||
error_free_or_abort(&err);
|
||||
g_assert(!qdict);
|
||||
|
||||
/* Overlong key */
|
||||
memset(long_key, 'a', 127);
|
||||
long_key[127] = 'z';
|
||||
|
@ -73,6 +78,11 @@ static void test_keyval_parse(void)
|
|||
QDECREF(qdict);
|
||||
g_free(params);
|
||||
|
||||
/* Crap after valid key */
|
||||
qdict = keyval_parse("key[0]=val", NULL, &err);
|
||||
error_free_or_abort(&err);
|
||||
g_assert(!qdict);
|
||||
|
||||
/* Multiple keys, last one wins */
|
||||
qdict = keyval_parse("a=1,b=2,,x,a=3", NULL, &error_abort);
|
||||
g_assert_cmpuint(qdict_size(qdict), ==, 2);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue