aboutsummaryrefslogtreecommitdiff
path: root/util/keyval.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-02-28 22:27:05 +0100
committerMarkus Armbruster <armbru@redhat.com>2017-03-07 16:07:47 +0100
commitf740048323398ebde9575a5730bf6d9f2a237f08 (patch)
treea7fcd911721549b578079bcd8dec05849398a286 /util/keyval.c
parent069b64e3fe75c81edef6685c9941a7937a48fec4 (diff)
downloadqemu-f740048323398ebde9575a5730bf6d9f2a237f08.zip
qemu-f740048323398ebde9575a5730bf6d9f2a237f08.tar.gz
qemu-f740048323398ebde9575a5730bf6d9f2a237f08.tar.bz2
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>
Diffstat (limited to 'util/keyval.c')
-rw-r--r--util/keyval.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/util/keyval.c b/util/keyval.c
index 089685d..cb484ef 100644
--- a/util/keyval.c
+++ b/util/keyval.c
@@ -34,6 +34,8 @@
* doesn't have one, because R.a must be an object to satisfy a.b=1
* and a string to satisfy a=2.
*
+ * Key-fragments must be valid QAPI names.
+ *
* The length of any key-fragment must be between 1 and 127.
*
* Design flaw: there is no way to denote an empty non-root object.
@@ -51,12 +53,12 @@
* where no-key is syntactic sugar for implied-key=val-no-key.
*
* TODO support lists
- * TODO support key-fragment with __RFQDN_ prefix (downstream extensions)
*/
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qapi/qmp/qstring.h"
+#include "qapi/util.h"
#include "qemu/option.h"
/*
@@ -118,6 +120,7 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,
size_t len;
char key_in_cur[128];
QDict *cur;
+ int ret;
QObject *next;
QString *val;
@@ -137,9 +140,10 @@ static const char *keyval_parse_one(QDict *qdict, const char *params,
cur = qdict;
s = key;
for (;;) {
- for (len = 0; s + len < key_end && s[len] != '.'; len++) {
- }
- if (!len) {
+ ret = parse_qapi_name(s, false);
+ len = ret < 0 ? 0 : ret;
+ assert(s + len <= key_end);
+ if (!len || (s + len < key_end && s[len] != '.')) {
assert(key != implied_key);
error_setg(errp, "Invalid parameter '%.*s'",
(int)(key_end - key), key);