From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, armbru@redhat.com
Subject: [PATCH v2 3/3] vl: allow passing JSON to -object
Date: Fri, 12 Mar 2021 12:35:47 -0500 [thread overview]
Message-ID: <20210312173547.1283477-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20210312173547.1283477-1-pbonzini@redhat.com>
Extend the ObjectOption code that was added in the previous patch to
enable passing JSON to -object. Even though we cannot yet add
non-scalar properties with the human-friendly comma-separated syntax,
they can now be added as JSON.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
softmmu/vl.c | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index ae017de46c..0e3fa53057 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -31,6 +31,7 @@
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qjson.h"
#include "qemu-version.h"
#include "qemu/cutils.h"
#include "qemu/help_option.h"
@@ -1712,22 +1713,30 @@ static void object_option_parse(const char *optarg)
const char *type;
Visitor *v;
- opts = qemu_opts_parse_noisily(qemu_find_opts("object"),
- optarg, true);
- if (!opts) {
- exit(1);
- }
+ if (optarg[0] == '{') {
+ QObject *obj = qobject_from_json(optarg, &error_fatal);
- type = qemu_opt_get(opts, "qom-type");
- if (!type) {
- error_setg(&error_fatal, QERR_MISSING_PARAMETER, "qom-type");
- }
- if (user_creatable_print_help(type, opts)) {
- exit(0);
+ v = qobject_input_visitor_new(obj);
+ qobject_unref(obj);
+ } else {
+ opts = qemu_opts_parse_noisily(qemu_find_opts("object"),
+ optarg, true);
+ if (!opts) {
+ exit(1);
+ }
+
+ type = qemu_opt_get(opts, "qom-type");
+ if (!type) {
+ error_setg(&error_fatal, QERR_MISSING_PARAMETER, "qom-type");
+ }
+ if (user_creatable_print_help(type, opts)) {
+ exit(0);
+ }
+
+ v = opts_visitor_new(opts);
}
opt = g_new0(ObjectOption, 1);
- v = opts_visitor_new(opts);
visit_type_ObjectOptions(v, NULL, &opt->opts, &error_fatal);
visit_free(v);
--
2.26.2
next prev parent reply other threads:[~2021-03-12 18:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 17:35 [PATCH v2 0/3] vl: QAPIfy -object Paolo Bonzini
2021-03-12 17:35 ` [PATCH v2 1/3] tests: convert check-qom-proplist to keyval Paolo Bonzini
2021-03-12 17:35 ` [PATCH v2 2/3] qom: move user_creatable_add_opts logic to vl.c and QAPIfy it Paolo Bonzini
2021-03-17 11:48 ` Kevin Wolf
2021-04-12 16:53 ` David Hildenbrand
2021-04-13 4:41 ` Markus Armbruster
2021-04-13 8:13 ` David Hildenbrand
2021-04-13 8:33 ` David Hildenbrand
2021-04-13 9:38 ` Kevin Wolf
2021-04-13 9:48 ` Markus Armbruster
2021-04-16 14:56 ` Paolo Bonzini
2021-03-12 17:35 ` Paolo Bonzini [this message]
2021-03-16 17:31 ` [PATCH v2 0/3] vl: QAPIfy -object Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210312173547.1283477-4-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).