From nobody Sun Apr 28 03:41:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487086798463843.0413795179243; Tue, 14 Feb 2017 07:39:58 -0800 (PST) Received: from localhost ([::1]:35542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdfCv-0000Ir-6t for importer@patchew.org; Tue, 14 Feb 2017 10:39:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdfBB-0007Gy-9A for qemu-devel@nongnu.org; Tue, 14 Feb 2017 10:38:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdfB9-0007rT-HT for qemu-devel@nongnu.org; Tue, 14 Feb 2017 10:38:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51888) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdfB1-0007hO-U5; Tue, 14 Feb 2017 10:38:00 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0EBA663E2B; Tue, 14 Feb 2017 15:38:00 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1EFbwoG013969 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 14 Feb 2017 10:37:59 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0350611384AC; Tue, 14 Feb 2017 16:37:57 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 14 Feb 2017 16:37:55 +0100 Message-Id: <1487086676-24339-2-git-send-email-armbru@redhat.com> In-Reply-To: <1487086676-24339-1-git-send-email-armbru@redhat.com> References: <1487086676-24339-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 14 Feb 2017 15:38:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH RFC v2 1/2] util/qemu-option: New opt_parse_qdict() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pkrempa@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" opt_parse_qdict() parses KEY=3DVALUE,... 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=3D". I intend to grow this into a saner replacement for QemuOpts. It'll take time, though. Signed-off-by: Markus Armbruster --- 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); =20 +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); } =20 +static void test_opt_parse_qdict(void) +{ + Error *err =3D NULL; + QDict *qdict, *sub_qdict; + char long_key[129]; + char *params; + + /* Nothing */ + qdict =3D opt_parse_qdict("", NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 0); + QDECREF(qdict); + + /* Empty key */ + qdict =3D opt_parse_qdict("=3Dval", NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + + /* Empty key component */ + qdict =3D opt_parse_qdict(".", NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + qdict =3D opt_parse_qdict("key.", NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + + /* Overlong key */ + memset(long_key, 'a', 127); + long_key[127] =3D 'z'; + long_key[128] =3D 0; + params =3D g_strdup_printf("k.%s=3Dv", long_key); + qdict =3D opt_parse_qdict(params + 2, NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + + /* Overlong key component */ + qdict =3D opt_parse_qdict(params, NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + g_free(params); + + /* Long key */ + params =3D g_strdup_printf("k.%s=3Dv", long_key + 1); + qdict =3D opt_parse_qdict(params + 2, NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 1); + g_assert_cmpstr(qdict_get_try_str(qdict, long_key + 1), =3D=3D, "v"); + QDECREF(qdict); + + /* Long key component */ + qdict =3D opt_parse_qdict(params, NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 1); + sub_qdict =3D qdict_get_qdict(qdict, "k"); + g_assert(sub_qdict); + g_assert_cmpuint(qdict_size(sub_qdict), =3D=3D, 1); + g_assert_cmpstr(qdict_get_try_str(sub_qdict, long_key + 1), =3D=3D, "v= "); + QDECREF(qdict); + g_free(params); + + /* Multiple keys, last one wins */ + qdict =3D opt_parse_qdict("a=3D1,b=3D2,,x,a=3D3", NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 2); + g_assert_cmpstr(qdict_get_try_str(qdict, "a"), =3D=3D, "3"); + g_assert_cmpstr(qdict_get_try_str(qdict, "b"), =3D=3D, "2,x"); + QDECREF(qdict); + + /* Even when it doesn't in QemuOpts */ + qdict =3D opt_parse_qdict("id=3Dfoo,id=3Dbar", NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 1); + g_assert_cmpstr(qdict_get_try_str(qdict, "id"), =3D=3D, "bar"); + QDECREF(qdict); + + /* Dotted keys */ + qdict =3D opt_parse_qdict("a.b.c=3D1,a.b.c=3D2,d=3D3", NULL, &error_ab= ort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 2); + sub_qdict =3D qdict_get_qdict(qdict, "a"); + g_assert(sub_qdict); + g_assert_cmpuint(qdict_size(sub_qdict), =3D=3D, 1); + sub_qdict =3D qdict_get_qdict(sub_qdict, "b"); + g_assert(sub_qdict); + g_assert_cmpuint(qdict_size(sub_qdict), =3D=3D, 1); + g_assert_cmpstr(qdict_get_try_str(sub_qdict, "c"), =3D=3D, "2"); + g_assert_cmpstr(qdict_get_try_str(qdict, "d"), =3D=3D, "3"); + QDECREF(qdict); + + /* Inconsistent dotted keys */ + qdict =3D opt_parse_qdict("a.b=3D1,a=3D2", NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + qdict =3D opt_parse_qdict("a.b=3D1,a.b.c=3D2", NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + + /* Implied value */ + qdict =3D opt_parse_qdict("an,noaus,noaus=3D", NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 3); + g_assert_cmpstr(qdict_get_try_str(qdict, "an"), =3D=3D, "on"); + g_assert_cmpstr(qdict_get_try_str(qdict, "aus"), =3D=3D, "off"); + g_assert_cmpstr(qdict_get_try_str(qdict, "noaus"), =3D=3D, ""); + QDECREF(qdict); + + /* Implied key */ + qdict =3D opt_parse_qdict("an,noaus,noaus=3D", "implied", &error_abort= ); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 3); + g_assert_cmpstr(qdict_get_try_str(qdict, "implied"), =3D=3D, "an"); + g_assert_cmpstr(qdict_get_try_str(qdict, "aus"), =3D=3D, "off"); + g_assert_cmpstr(qdict_get_try_str(qdict, "noaus"), =3D=3D, ""); + QDECREF(qdict); + + /* Trailing comma is ignored */ + qdict =3D opt_parse_qdict("x=3Dy,", NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 1); + g_assert_cmpstr(qdict_get_try_str(qdict, "x"), =3D=3D, "y"); + QDECREF(qdict); + + /* Except when it isn't */ + qdict =3D opt_parse_qdict(",", NULL, &err); + error_free_or_abort(&err); + g_assert(!qdict); + + /* Value containing ,id=3D not misinterpreted as QemuOpts does */ + qdict =3D opt_parse_qdict("x=3D,,id=3Dbar", NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 1); + g_assert_cmpstr(qdict_get_try_str(qdict, "x"), =3D=3D, ",id=3Dbar"); + QDECREF(qdict); + + /* Anti-social ID is left to caller */ + qdict =3D opt_parse_qdict("id=3D666", NULL, &error_abort); + g_assert_cmpuint(qdict_size(qdict), =3D=3D, 1); + g_assert_cmpstr(qdict_get_try_str(qdict, "id"), =3D=3D, "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, =20 return dst; } + +static QObject *opt_parse_put(QDict *qdict, const char *key, QString *valu= e, + Error **errp) +{ + QObject *old, *new; + + old =3D qdict_get(qdict, key); + if (old) { + if (qobject_type(old) !=3D (value ? QTYPE_QSTRING : QTYPE_QDICT)) { + error_setg(errp, "Option key '%s' used inconsistently", key); + return NULL; + } + if (!value) { + return old; + } + new =3D QOBJECT(value); + } else { + new =3D 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_k= ey, + Error **errp) +{ + QDict *cur =3D qdict; + QObject *next; + const char *s, *key; + size_t len; + char key_buf[128]; + QString *val; + + s =3D params; + len =3D strcspn(s, ".=3D,"); + if (implied_key && (s[len] =3D=3D ',' || !s[len])) { + /* Desugar implied key */ + key =3D implied_key; + } else { + key_buf[0] =3D 0; + for (;;) { + if (!len) { + error_setg(errp, "Invalid option key"); + return NULL; + } + if (len >=3D sizeof(key_buf)) { + error_setg(errp, "Option key component '%.*s' is too long", + (int)len, s); + return NULL; + } + + if (key_buf[0]) { + next =3D opt_parse_put(cur, key_buf, NULL, errp); + if (!next) { + return NULL; + } + cur =3D qobject_to_qdict(next); + assert(cur); + } + + memcpy(key_buf, s, len); + key_buf[len] =3D 0; + s +=3D len; + if (*s !=3D '.') { + break; + } + s++; + len =3D strcspn(s, ".=3D,"); + } + key =3D key_buf; + + if (*s =3D=3D '=3D') { + s++; + } else { + /* + * Desugar implied value: it's "on", except when @key + * starts with "no", it's "off". Thus, key "novocaine" + * gets desugard to "vocaine=3Doff", not to "novocaine=3Don". + * If sugar isn't bad enough for you, make it ambiguous... + */ + if (*s =3D=3D ',') + s++; + if (!strncmp(key, "no", 2)) { + key +=3D 2; + val =3D qstring_from_str("off"); + } else { + val =3D qstring_from_str("on"); + } + goto got_val; + } + } + + val =3D qstring_new(); + for (;;) { + if (!*s) { + break; + } else if (*s =3D=3D ',') { + s++; + if (*s !=3D ',') { + 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 =3D qdict_new(); + const char *s; + + s =3D params; + while (*s) { + s =3D opt_parse_one(qdict, s, implied_key, errp); + if (!s) { + QDECREF(qdict); + return NULL; + } + implied_key =3D NULL; + }=20 + + return qdict; +} --=20 2.7.4 From nobody Sun Apr 28 03:41:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487086955624852.8469763758986; Tue, 14 Feb 2017 07:42:35 -0800 (PST) Received: from localhost ([::1]:35559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdfFP-0003CI-9y for importer@patchew.org; Tue, 14 Feb 2017 10:42:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdfBA-0007GB-N5 for qemu-devel@nongnu.org; Tue, 14 Feb 2017 10:38:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdfB9-0007rJ-Fu for qemu-devel@nongnu.org; Tue, 14 Feb 2017 10:38:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35236) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdfB1-0007hP-Tz; Tue, 14 Feb 2017 10:38:00 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 109723D95D; Tue, 14 Feb 2017 15:38:00 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-50.ams2.redhat.com [10.36.116.50]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1EFbwRV013971 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 14 Feb 2017 10:37:59 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0625A11384AE; Tue, 14 Feb 2017 16:37:57 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 14 Feb 2017 16:37:56 +0100 Message-Id: <1487086676-24339-3-git-send-email-armbru@redhat.com> In-Reply-To: <1487086676-24339-1-git-send-email-armbru@redhat.com> References: <1487086676-24339-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 14 Feb 2017 15:38:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH RFC v2 2/2] block: Crude initial implementation of -blockdev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, pkrempa@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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": "fi= le", "filename": "foo.img"} }' The JSON argument doesn't exactly blend into the existing option syntax, so the traditional KEY=3DVALUE,... syntax is also supported, using dotted keys to do the nesting: -blockdev node-name=3Dfoo,driver=3Draw,file.driver=3Dfile,file.filename= =3Dfoo.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 --- 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 =20 +DEF("blockdev", HAS_ARG, QEMU_OPTION_blockdev, + "-blockdev FIXME document\n", QEMU_OPTION_blockdev) + DEF("drive", HAS_ARG, QEMU_OPTION_drive, "-drive [file=3Dfile][,if=3Dtype][,bus=3Dn][,unit=3Dm][,media=3Dd][,in= dex=3Di]\n" " [,cyls=3Dc,heads=3Dh,secs=3Ds[,trans=3Dt]][,snapshot=3Don|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 =3D NULL; Error *err =3D NULL; bool list_data_dirs =3D false; + typedef struct BlockdevOptions_queue { + BlockdevOptions *bdo; + Location loc; + QSIMPLEQ_ENTRY(BlockdevOptions_queue) entry; + } BlockdevOptions_queue; + QSIMPLEQ_HEAD(, BlockdevOptions_queue) bdo_queue =3D QSIMPLEQ_HEAD_INI= TIALIZER(bdo_queue); =20 module_call_init(MODULE_INIT_TRACE); =20 @@ -3106,6 +3115,38 @@ int main(int argc, char **argv, char **envp) drive_add(IF_DEFAULT, popt->index - QEMU_OPTION_hda, optar= g, HD_OPTS); break; + case QEMU_OPTION_blockdev: + { + bool is_json =3D optarg[0] =3D=3D '{'; + QObject *obj; + QDict *args; + Visitor *v; + BlockdevOptions_queue *bdo; + + if (is_json) { + obj =3D qobject_from_json(optarg); + // TODO get error out of parser + if (!obj) { + error_report("invalid JSON"); + exit(1); + } + args =3D qobject_to_qdict(obj); + assert(args); + } else { + args =3D opt_parse_qdict(optarg, "driver", + &error_fatal); + } + + bdo =3D g_new(BlockdevOptions_queue, 1); + v =3D 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) =3D=3D 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 =3D 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); --=20 2.7.4