* [Qemu-devel] [PATCH RFC v2 1/2] util/qemu-option: New opt_parse_qdict()
2017-02-14 15:37 [Qemu-devel] [PATCH RFC v2 0/2] block: Crude initial implementation of -blockdev Markus Armbruster
@ 2017-02-14 15:37 ` Markus Armbruster
2017-02-14 15:37 ` [Qemu-devel] [PATCH RFC v2 2/2] block: Crude initial implementation of -blockdev Markus Armbruster
2017-02-14 23:09 ` [Qemu-devel] [PATCH RFC v2 0/2] " Markus Armbruster
2 siblings, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2017-02-14 15:37 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, kwolf, pkrempa
opt_parse_qdict() parses KEY=VALUE,... into a QDict. Works like
qemu_opts_parse(), except:
* Returns a QDict instead of a QemuOpts (d'oh).
* It supports nesting, unlike QemuOpts: a KEY is split into key
components at '.' (dotted key convention; the block layer does
something similar on top of QemuOpts). The key components are QDict
keys, and the last one's value is updated to VALUE.
* Each key component may be up to 127 bytes long. qemu_opts_parse()
limits the entire key to 127 bytes.
* Overlong key components are rejected. qemu_opts_parse() silently
truncates them.
* Empty key components are rejected. qemu_opts_parse() happily
accepts empty keys.
* It does not store the returned value. qemu_opts_parse() stores it
in the QemuOptsList.
* It does not treat parameter "id" specially. qemu_opts_parse()
ignores all but the first "id", and fails when its value isn't
id_wellformed(), or duplicate (a QemuOpts with the same ID is
already stored). It also screws up when a value contains ",id=".
I intend to grow this into a saner replacement for QemuOpts. It'll
take time, though.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/qemu/option.h | 3 ++
tests/test-qemu-opts.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++
util/qemu-option.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 266 insertions(+)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index 1f9e3f9..436a13c 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -132,4 +132,7 @@ void qemu_opts_print_help(QemuOptsList *list);
void qemu_opts_free(QemuOptsList *list);
QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);
+QDict *opt_parse_qdict(const char *params, const char *implied_key,
+ Error **errp);
+
#endif
diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index b9d5b7e..bbb821f 100644
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -702,6 +702,137 @@ static void test_opts_parse_size(void)
qemu_opts_reset(&opts_list_02);
}
+static void test_opt_parse_qdict(void)
+{
+ Error *err = NULL;
+ QDict *qdict, *sub_qdict;
+ char long_key[129];
+ char *params;
+
+ /* Nothing */
+ qdict = opt_parse_qdict("", NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 0);
+ QDECREF(qdict);
+
+ /* Empty key */
+ qdict = opt_parse_qdict("=val", NULL, &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
+
+ /* Empty key component */
+ qdict = opt_parse_qdict(".", NULL, &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
+ qdict = opt_parse_qdict("key.", NULL, &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
+
+ /* Overlong key */
+ memset(long_key, 'a', 127);
+ long_key[127] = 'z';
+ long_key[128] = 0;
+ params = g_strdup_printf("k.%s=v", long_key);
+ qdict = opt_parse_qdict(params + 2, NULL, &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
+
+ /* Overlong key component */
+ qdict = opt_parse_qdict(params, NULL, &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
+ g_free(params);
+
+ /* Long key */
+ params = g_strdup_printf("k.%s=v", long_key + 1);
+ qdict = opt_parse_qdict(params + 2, NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 1);
+ g_assert_cmpstr(qdict_get_try_str(qdict, long_key + 1), ==, "v");
+ QDECREF(qdict);
+
+ /* Long key component */
+ qdict = opt_parse_qdict(params, NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 1);
+ sub_qdict = qdict_get_qdict(qdict, "k");
+ g_assert(sub_qdict);
+ g_assert_cmpuint(qdict_size(sub_qdict), ==, 1);
+ g_assert_cmpstr(qdict_get_try_str(sub_qdict, long_key + 1), ==, "v");
+ QDECREF(qdict);
+ g_free(params);
+
+ /* Multiple keys, last one wins */
+ qdict = opt_parse_qdict("a=1,b=2,,x,a=3", NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 2);
+ g_assert_cmpstr(qdict_get_try_str(qdict, "a"), ==, "3");
+ g_assert_cmpstr(qdict_get_try_str(qdict, "b"), ==, "2,x");
+ QDECREF(qdict);
+
+ /* Even when it doesn't in QemuOpts */
+ qdict = opt_parse_qdict("id=foo,id=bar", NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 1);
+ g_assert_cmpstr(qdict_get_try_str(qdict, "id"), ==, "bar");
+ QDECREF(qdict);
+
+ /* Dotted keys */
+ qdict = opt_parse_qdict("a.b.c=1,a.b.c=2,d=3", NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 2);
+ sub_qdict = qdict_get_qdict(qdict, "a");
+ g_assert(sub_qdict);
+ g_assert_cmpuint(qdict_size(sub_qdict), ==, 1);
+ sub_qdict = qdict_get_qdict(sub_qdict, "b");
+ g_assert(sub_qdict);
+ g_assert_cmpuint(qdict_size(sub_qdict), ==, 1);
+ g_assert_cmpstr(qdict_get_try_str(sub_qdict, "c"), ==, "2");
+ g_assert_cmpstr(qdict_get_try_str(qdict, "d"), ==, "3");
+ QDECREF(qdict);
+
+ /* Inconsistent dotted keys */
+ qdict = opt_parse_qdict("a.b=1,a=2", NULL, &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
+ qdict = opt_parse_qdict("a.b=1,a.b.c=2", NULL, &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
+
+ /* Implied value */
+ qdict = opt_parse_qdict("an,noaus,noaus=", NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 3);
+ g_assert_cmpstr(qdict_get_try_str(qdict, "an"), ==, "on");
+ g_assert_cmpstr(qdict_get_try_str(qdict, "aus"), ==, "off");
+ g_assert_cmpstr(qdict_get_try_str(qdict, "noaus"), ==, "");
+ QDECREF(qdict);
+
+ /* Implied key */
+ qdict = opt_parse_qdict("an,noaus,noaus=", "implied", &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 3);
+ g_assert_cmpstr(qdict_get_try_str(qdict, "implied"), ==, "an");
+ g_assert_cmpstr(qdict_get_try_str(qdict, "aus"), ==, "off");
+ g_assert_cmpstr(qdict_get_try_str(qdict, "noaus"), ==, "");
+ QDECREF(qdict);
+
+ /* Trailing comma is ignored */
+ qdict = opt_parse_qdict("x=y,", NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 1);
+ g_assert_cmpstr(qdict_get_try_str(qdict, "x"), ==, "y");
+ QDECREF(qdict);
+
+ /* Except when it isn't */
+ qdict = opt_parse_qdict(",", NULL, &err);
+ error_free_or_abort(&err);
+ g_assert(!qdict);
+
+ /* Value containing ,id= not misinterpreted as QemuOpts does */
+ qdict = opt_parse_qdict("x=,,id=bar", NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 1);
+ g_assert_cmpstr(qdict_get_try_str(qdict, "x"), ==, ",id=bar");
+ QDECREF(qdict);
+
+ /* Anti-social ID is left to caller */
+ qdict = opt_parse_qdict("id=666", NULL, &error_abort);
+ g_assert_cmpuint(qdict_size(qdict), ==, 1);
+ g_assert_cmpstr(qdict_get_try_str(qdict, "id"), ==, "666");
+ QDECREF(qdict);
+}
+
int main(int argc, char *argv[])
{
register_opts();
@@ -720,6 +851,7 @@ int main(int argc, char *argv[])
g_test_add_func("/qemu-opts/opts_parse/bool", test_opts_parse_bool);
g_test_add_func("/qemu-opts/opts_parse/number", test_opts_parse_number);
g_test_add_func("/qemu-opts/opts_parse/size", test_opts_parse_size);
+ g_test_add_func("/qemu-opts/opt_parse_qdict", test_opt_parse_qdict);
g_test_run();
return 0;
}
diff --git a/util/qemu-option.c b/util/qemu-option.c
index c11ce93..49d2760 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -1184,3 +1184,134 @@ QemuOptsList *qemu_opts_append(QemuOptsList *dst,
return dst;
}
+
+static QObject *opt_parse_put(QDict *qdict, const char *key, QString *value,
+ Error **errp)
+{
+ QObject *old, *new;
+
+ old = qdict_get(qdict, key);
+ if (old) {
+ if (qobject_type(old) != (value ? QTYPE_QSTRING : QTYPE_QDICT)) {
+ error_setg(errp, "Option key '%s' used inconsistently", key);
+ return NULL;
+ }
+ if (!value) {
+ return old;
+ }
+ new = QOBJECT(value);
+ } else {
+ new = QOBJECT(value) ?: QOBJECT(qdict_new());
+ }
+ qdict_put_obj(qdict, key, new);
+ return new;
+}
+
+static const char *opt_parse_one(QDict *qdict,
+ const char *params, const char *implied_key,
+ Error **errp)
+{
+ QDict *cur = qdict;
+ QObject *next;
+ const char *s, *key;
+ size_t len;
+ char key_buf[128];
+ QString *val;
+
+ s = params;
+ len = strcspn(s, ".=,");
+ if (implied_key && (s[len] == ',' || !s[len])) {
+ /* Desugar implied key */
+ key = implied_key;
+ } else {
+ key_buf[0] = 0;
+ for (;;) {
+ if (!len) {
+ error_setg(errp, "Invalid option key");
+ return NULL;
+ }
+ if (len >= sizeof(key_buf)) {
+ error_setg(errp, "Option key component '%.*s' is too long",
+ (int)len, s);
+ return NULL;
+ }
+
+ if (key_buf[0]) {
+ next = opt_parse_put(cur, key_buf, NULL, errp);
+ if (!next) {
+ return NULL;
+ }
+ cur = qobject_to_qdict(next);
+ assert(cur);
+ }
+
+ memcpy(key_buf, s, len);
+ key_buf[len] = 0;
+ s += len;
+ if (*s != '.') {
+ break;
+ }
+ s++;
+ len = strcspn(s, ".=,");
+ }
+ key = key_buf;
+
+ if (*s == '=') {
+ s++;
+ } else {
+ /*
+ * Desugar implied value: it's "on", except when @key
+ * starts with "no", it's "off". Thus, key "novocaine"
+ * gets desugard to "vocaine=off", not to "novocaine=on".
+ * If sugar isn't bad enough for you, make it ambiguous...
+ */
+ if (*s == ',')
+ s++;
+ if (!strncmp(key, "no", 2)) {
+ key += 2;
+ val = qstring_from_str("off");
+ } else {
+ val = qstring_from_str("on");
+ }
+ goto got_val;
+ }
+ }
+
+ val = qstring_new();
+ for (;;) {
+ if (!*s) {
+ break;
+ } else if (*s == ',') {
+ s++;
+ if (*s != ',') {
+ break;
+ }
+ }
+ qstring_append_chr(val, *s++);
+ }
+
+got_val:
+ if (!opt_parse_put(cur, key, val, errp)) {
+ return NULL;
+ }
+ return s;
+}
+
+QDict *opt_parse_qdict(const char *params, const char *implied_key,
+ Error **errp)
+{
+ QDict *qdict = qdict_new();
+ const char *s;
+
+ s = params;
+ while (*s) {
+ s = opt_parse_one(qdict, s, implied_key, errp);
+ if (!s) {
+ QDECREF(qdict);
+ return NULL;
+ }
+ implied_key = NULL;
+ }
+
+ return qdict;
+}
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PATCH RFC v2 2/2] block: Crude initial implementation of -blockdev
2017-02-14 15:37 [Qemu-devel] [PATCH RFC v2 0/2] block: Crude initial implementation of -blockdev Markus Armbruster
2017-02-14 15:37 ` [Qemu-devel] [PATCH RFC v2 1/2] util/qemu-option: New opt_parse_qdict() Markus Armbruster
@ 2017-02-14 15:37 ` Markus Armbruster
2017-02-14 23:09 ` [Qemu-devel] [PATCH RFC v2 0/2] " Markus Armbruster
2 siblings, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2017-02-14 15:37 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, kwolf, pkrempa
The new command line option -blockdev works like QMP command
blockdev-add.
The option argument may be given in JSON syntax, exactly as in QMP.
Example usage:
-blockdev '{"node-name": "foo", "driver": "raw", "file": {"driver": "file", "filename": "foo.img"} }'
The JSON argument doesn't exactly blend into the existing option
syntax, so the traditional KEY=VALUE,... syntax is also supported,
using dotted keys to do the nesting:
-blockdev node-name=foo,driver=raw,file.driver=file,file.filename=foo.img
Note that calling qmp_blockdev_add() (say via qmp_marshal_block_add())
right away would crash. We need to stash the configuration for later
instead. This is crudely done, and bypasses QemuOpts, even though
storing configuration is what QemuOpts is for. Need to revamp option
infrastructure to support QAPI types like BlockdevOptions.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qemu-options.hx | 3 +++
vl.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+)
diff --git a/qemu-options.hx b/qemu-options.hx
index ad2f8fc..a66bd65 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -512,6 +512,9 @@ Use @var{file} as CD-ROM image (you cannot use @option{-hdc} and
using @file{/dev/cdrom} as filename (@pxref{host_drives}).
ETEXI
+DEF("blockdev", HAS_ARG, QEMU_OPTION_blockdev,
+ "-blockdev FIXME document\n", QEMU_OPTION_blockdev)
+
DEF("drive", HAS_ARG, QEMU_OPTION_drive,
"-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
" [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
diff --git a/vl.c b/vl.c
index b4eaf03..f2d46c3 100644
--- a/vl.c
+++ b/vl.c
@@ -94,6 +94,9 @@ int main(int argc, char **argv)
#include "migration/colo.h"
#include "sysemu/kvm.h"
#include "sysemu/hax.h"
+#include "qapi/qobject-input-visitor.h"
+#include "qapi/qobject-input-visitor.h"
+#include "qapi-visit.h"
#include "qapi/qmp/qjson.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
@@ -2965,6 +2968,12 @@ int main(int argc, char **argv, char **envp)
Error *main_loop_err = NULL;
Error *err = NULL;
bool list_data_dirs = false;
+ typedef struct BlockdevOptions_queue {
+ BlockdevOptions *bdo;
+ Location loc;
+ QSIMPLEQ_ENTRY(BlockdevOptions_queue) entry;
+ } BlockdevOptions_queue;
+ QSIMPLEQ_HEAD(, BlockdevOptions_queue) bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue);
module_call_init(MODULE_INIT_TRACE);
@@ -3106,6 +3115,38 @@ int main(int argc, char **argv, char **envp)
drive_add(IF_DEFAULT, popt->index - QEMU_OPTION_hda, optarg,
HD_OPTS);
break;
+ case QEMU_OPTION_blockdev:
+ {
+ bool is_json = optarg[0] == '{';
+ QObject *obj;
+ QDict *args;
+ Visitor *v;
+ BlockdevOptions_queue *bdo;
+
+ if (is_json) {
+ obj = qobject_from_json(optarg);
+ // TODO get error out of parser
+ if (!obj) {
+ error_report("invalid JSON");
+ exit(1);
+ }
+ args = qobject_to_qdict(obj);
+ assert(args);
+ } else {
+ args = opt_parse_qdict(optarg, "driver",
+ &error_fatal);
+ }
+
+ bdo = g_new(BlockdevOptions_queue, 1);
+ v = qobject_input_visitor_new(QOBJECT(args), true);
+ visit_type_BlockdevOptions(v, NULL, &bdo->bdo,
+ &error_fatal);
+ visit_free(v);
+ QDECREF(args);
+ loc_save(&bdo->loc);
+ QSIMPLEQ_INSERT_TAIL(&bdo_queue, bdo, entry);
+ break;
+ }
case QEMU_OPTION_drive:
if (drive_def(optarg) == NULL) {
exit(1);
@@ -4418,6 +4459,16 @@ int main(int argc, char **argv, char **envp)
qemu_opts_foreach(qemu_find_opts("drive"), drive_enable_snapshot,
NULL, NULL);
}
+ while (!QSIMPLEQ_EMPTY(&bdo_queue)) {
+ BlockdevOptions_queue *bdo = QSIMPLEQ_FIRST(&bdo_queue);
+
+ QSIMPLEQ_REMOVE_HEAD(&bdo_queue, entry);
+ loc_push_restore(&bdo->loc);
+ qmp_blockdev_add(bdo->bdo, &error_fatal);
+ loc_pop(&bdo->loc);
+ qapi_free_BlockdevOptions(bdo->bdo);
+ g_free(bdo);
+ }
if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func,
&machine_class->block_default_type, NULL)) {
exit(1);
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread