From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, qemu-block@nongnu.org
Subject: [PATCH v4 7/7] qemu-storage-daemon: Remove QemuOpts from --object parser
Date: Sun, 11 Oct 2020 09:35:05 +0200 [thread overview]
Message-ID: <20201011073505.1185335-8-armbru@redhat.com> (raw)
In-Reply-To: <20201011073505.1185335-1-armbru@redhat.com>
From: Kevin Wolf <kwolf@redhat.com>
The command line parser for --object parses the input twice: Once into
QemuOpts just for detecting help options, and then again into a QDict
using the keyval parser for actually creating the object.
Now that the keyval parser can also detect help options, we can simplify
this and remove the QemuOpts part.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
storage-daemon/qemu-storage-daemon.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
index 6f0e0cfb36..e419ba9f19 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -264,21 +264,14 @@ static void process_options(int argc, char *argv[])
}
case OPTION_OBJECT:
{
- QemuOpts *opts;
- const char *type;
QDict *args;
+ bool help;
- /* FIXME The keyval parser rejects 'help' arguments, so we must
- * unconditionall try QemuOpts first. */
- opts = qemu_opts_parse(&qemu_object_opts,
- optarg, true, &error_fatal);
- type = qemu_opt_get(opts, "qom-type");
- if (type && user_creatable_print_help(type, opts)) {
+ args = keyval_parse(optarg, "qom-type", &help, &error_fatal);
+ if (help) {
+ user_creatable_print_help_from_qdict(args);
exit(EXIT_SUCCESS);
}
- qemu_opts_del(opts);
-
- args = keyval_parse(optarg, "qom-type", NULL, &error_fatal);
user_creatable_add_dict(args, true, &error_fatal);
qobject_unref(args);
break;
--
2.26.2
next prev parent reply other threads:[~2020-10-11 7:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-11 7:34 [PATCH v4 0/7] qemu-storage-daemon: Remove QemuOpts from --object Markus Armbruster
2020-10-11 7:34 ` [PATCH v4 1/7] keyval: Fix and clarify grammar Markus Armbruster
2020-10-12 11:43 ` Eric Blake
2020-10-19 9:03 ` Markus Armbruster
2020-10-11 7:35 ` [PATCH v4 2/7] test-keyval: Demonstrate misparse of ', ' with implied key Markus Armbruster
2020-10-12 11:44 ` [PATCH v4 2/7] test-keyval: Demonstrate misparse of ',' " Eric Blake
2020-10-11 7:35 ` [PATCH v4 3/7] keyval: Fix parsing of ',' in value of " Markus Armbruster
2020-10-12 11:46 ` [PATCH v4 3/7] keyval: Fix parsing of ', ' " Eric Blake
2020-10-11 7:35 ` [PATCH v4 4/7] keyval: Parse help options Markus Armbruster
2020-10-12 11:51 ` Eric Blake
2020-10-19 9:06 ` Markus Armbruster
2020-10-12 14:35 ` Kevin Wolf
2020-10-19 9:04 ` Markus Armbruster
2020-10-11 7:35 ` [PATCH v4 5/7] qom: Factor out helpers from user_creatable_print_help() Markus Armbruster
2020-10-11 7:35 ` [PATCH v4 6/7] qom: Add user_creatable_print_help_from_qdict() Markus Armbruster
2020-10-11 7:35 ` Markus Armbruster [this message]
2020-10-12 14:39 ` [PATCH v4 0/7] qemu-storage-daemon: Remove QemuOpts from --object Kevin Wolf
2020-10-19 9:08 ` Markus Armbruster
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=20201011073505.1185335-8-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--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).