From: Eric Blake <eblake@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: kwolf@redhat.com, qemu-block@nongnu.org
Subject: Re: [PATCH v4 4/7] keyval: Parse help options
Date: Mon, 12 Oct 2020 06:51:19 -0500 [thread overview]
Message-ID: <2f9e1df0-9be8-e63c-8c2d-b1afbe952a0c@redhat.com> (raw)
In-Reply-To: <20201011073505.1185335-5-armbru@redhat.com>
On 10/11/20 2:35 AM, Markus Armbruster wrote:
> From: Kevin Wolf <kwolf@redhat.com>
>
> This adds a special meaning for 'help' and '?' as options to the keyval
> parser. Instead of being an error (because of a missing value) or a
> value for an implied key, they now request help, which is a new boolean
> output of the parser in addition to the QDict.
>
> A new parameter 'p_help' is added to keyval_parse() that contains on
> return whether help was requested. If NULL is passed, requesting help
> results in an error and all other cases work like before.
>
> +
> + /* "help" by itself, without implied key */
> + qdict = keyval_parse("help", NULL, &help, &error_abort);
> + g_assert_cmpuint(qdict_size(qdict), ==, 0);
> + g_assert(help);
> + qobject_unref(qdict);
> +
> + /* "help" by itself, with implied key */
> + qdict = keyval_parse("help", "implied", &help, &error_abort);
> + g_assert_cmpuint(qdict_size(qdict), ==, 0);
> + g_assert(help);
> + qobject_unref(qdict);
> +
> + /* "help" when no help is available, without implied key */
> + qdict = keyval_parse("help", NULL, NULL, &err);
> + error_free_or_abort(&err);
> + g_assert(!qdict);
> +
> + /* "help" when no help is available, with implied key */
> + qdict = keyval_parse("help", "implied", NULL, &err);
> + error_free_or_abort(&err);
> + g_assert(!qdict);
> +
> + /* Key "help" */
> + qdict = keyval_parse("help=on", NULL, &help, &error_abort);
> + g_assert_cmpuint(qdict_size(qdict), ==, 1);
> + g_assert_cmpstr(qdict_get_try_str(qdict, "help"), ==, "on");
> + g_assert(!help);
> + qobject_unref(qdict);
> +
> + /* "help" followed by crap, without implied key */
> + qdict = keyval_parse("help.abc", NULL, &help, &err);
> + error_free_or_abort(&err);
> + g_assert(!qdict);
> +
> + /* "help" followed by crap, with implied key */
> + qdict = keyval_parse("help.abc", "implied", &help, &err);
> + g_assert_cmpuint(qdict_size(qdict), ==, 1);
> + g_assert_cmpstr(qdict_get_try_str(qdict, "implied"), ==, "help.abc");
> + g_assert(!help);
> + qobject_unref(qdict);
> +
> + /* "help" with other stuff, without implied key */
> + qdict = keyval_parse("number=42,help,foo=bar", NULL, &help, &error_abort);
> + g_assert_cmpuint(qdict_size(qdict), ==, 2);
> + g_assert_cmpstr(qdict_get_try_str(qdict, "number"), ==, "42");
> + g_assert_cmpstr(qdict_get_try_str(qdict, "foo"), ==, "bar");
> + g_assert(help);
> + qobject_unref(qdict);
> +
> + /* "help" with other stuff, with implied key */
> + qdict = keyval_parse("val,help,foo=bar", "implied", &help, &error_abort);
> + g_assert_cmpuint(qdict_size(qdict), ==, 2);
> + g_assert_cmpstr(qdict_get_try_str(qdict, "implied"), ==, "val");
> + g_assert_cmpstr(qdict_get_try_str(qdict, "foo"), ==, "bar");
> + g_assert(help);
> + qobject_unref(qdict);
Is it worth checking that "helper" with implied key is a value, not help?
> +++ b/util/keyval.c
> @@ -14,10 +14,11 @@
> * KEY=VALUE,... syntax:
> *
> * key-vals = [ key-val { ',' key-val } [ ',' ] ]
> - * key-val = key '=' val
> + * key-val = key '=' val | help
> * key = key-fragment { '.' key-fragment }
> * key-fragment = / [^=,.]+ /
> * val = { / [^,]+ / | ',,' }
> + * help = 'help | '?'
Missing '
Otherwise
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
next prev parent reply other threads:[~2020-10-12 11:57 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 [this message]
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 ` [PATCH v4 7/7] qemu-storage-daemon: Remove QemuOpts from --object parser Markus Armbruster
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=2f9e1df0-9be8-e63c-8c2d-b1afbe952a0c@redhat.com \
--to=eblake@redhat.com \
--cc=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).