From: Markus Armbruster <armbru@redhat.com>
To: Eric Blake <eblake@redhat.com>
Cc: kwolf@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org,
mreitz@redhat.com
Subject: Re: [PATCH for-5.1 4/8] qemu-option: Avoid has_help_option() in qemu_opts_parse_noisily()
Date: Tue, 14 Apr 2020 12:04:04 +0200 [thread overview]
Message-ID: <871roqwfhn.fsf@dusky.pond.sub.org> (raw)
In-Reply-To: <4f38f94d-5c7a-c00f-c7dc-8bc28de4fd39@redhat.com> (Eric Blake's message of "Thu, 9 Apr 2020 13:07:31 -0500")
Eric Blake <eblake@redhat.com> writes:
> On 4/9/20 10:30 AM, Markus Armbruster wrote:
>> When opts_parse() sets @invalidp to true, qemu_opts_parse_noisily()
>> uses has_help_option() to decide whether to print help. This parses
>> the input string a second time, in a slightly different way.
>>
>> Easy to avoid: replace @invalidp by @help_wanted.
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>> util/qemu-option.c | 20 ++++++++++----------
>> 1 file changed, 10 insertions(+), 10 deletions(-)
>>
>
>> - opts = opts_parse(list, params, permit_abbrev, false, &invalidp, &err);
>> + opts = opts_parse(list, params, permit_abbrev, false, &help_wanted, &err);
>> if (err) {
>> - if (invalidp && has_help_option(params)) {
>> + if (help_wanted) {
>
> Yep, that is cleaner. Should there be testsuite coverage changing as
> a result of this?
Hmm. I guess the actual question is whether this patch changes
behavior.
@invalidp gets set to true when opt_set() runs into an unknown @name.
Aside: can't happend when opts_accepts_any(); such options can't rely on
qemu_opts_parse_noisily() providing help.
One reason for unknown @name is the user asking for help. We want to
provide it then. To find out, we use has_help_option(), which parses
certain corner cases differently. PATCH 1 demonstrates it can return
false incorrectly for certain corner cases. This patch fixes
qemu_opts_parse_noisily() to provide help as it should even for these
corner cases.
What about this:
* I put PATCH 5 "qemu-option: Fix has_help_option()'s sloppy parsing"
before this one, so that this one doesn't change behavior.
* I adjust this one's commit message accordingly: scratch ", in a
slightly different way".
Do we care enough to further document the bug fix in PATCH 5's commit
message? Even find an actual CLI option that reproduces the bug? I
doubt it. This is all about silly corner cases involving ','.
Perhaps has_help_option() can also return true incorrectly. I doubt we
care.
> Reviewed-by: Eric Blake <eblake@redhat.com>
Thanks!
next prev parent reply other threads:[~2020-04-14 10:04 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 15:30 [PATCH for-5.1 0/8] qemu-option: Fix corner cases and clean up Markus Armbruster
2020-04-09 15:30 ` [PATCH for-5.1 1/8] tests-qemu-opts: Cover has_help_option(), qemu_opt_has_help_opt() Markus Armbruster
2020-04-09 17:50 ` Eric Blake
2020-04-14 9:10 ` Markus Armbruster
2020-04-14 13:13 ` Kevin Wolf
2020-04-14 13:36 ` Markus Armbruster
2020-04-14 14:29 ` Kevin Wolf
2020-04-14 20:13 ` Markus Armbruster
2020-04-15 10:00 ` Kevin Wolf
2020-04-15 14:45 ` Markus Armbruster
2020-04-09 15:30 ` [PATCH for-5.1 2/8] qemu-options: Factor out get_opt_name_value() helper Markus Armbruster
2020-04-09 18:01 ` Eric Blake
2020-04-14 9:42 ` Markus Armbruster
2020-04-14 14:05 ` Kevin Wolf
2020-04-15 7:03 ` Markus Armbruster
2020-04-14 14:05 ` Kevin Wolf
2020-04-09 15:30 ` [PATCH for-5.1 3/8] qemu-option: Fix sloppy recognition of "id=..." after ", , " Markus Armbruster
2020-04-09 18:05 ` Eric Blake
2020-04-14 14:44 ` [PATCH for-5.1 3/8] qemu-option: Fix sloppy recognition of "id=..." after ",," Kevin Wolf
2020-04-09 15:30 ` [PATCH for-5.1 4/8] qemu-option: Avoid has_help_option() in qemu_opts_parse_noisily() Markus Armbruster
2020-04-09 18:07 ` Eric Blake
2020-04-14 10:04 ` Markus Armbruster [this message]
2020-04-09 15:30 ` [PATCH for-5.1 5/8] qemu-option: Fix has_help_option()'s sloppy parsing Markus Armbruster
2020-04-09 18:10 ` Eric Blake
2020-04-14 10:16 ` Markus Armbruster
2020-04-14 14:57 ` Kevin Wolf
2020-04-15 7:48 ` Markus Armbruster
2020-04-09 15:30 ` [PATCH for-5.1 6/8] test-qemu-opts: Simplify test_has_help_option() after bug fix Markus Armbruster
2020-04-09 18:13 ` Eric Blake
2020-04-14 14:58 ` Kevin Wolf
2020-04-09 15:30 ` [PATCH for-5.1 7/8] qemu-img: Factor out accumulate_options() helper Markus Armbruster
2020-04-09 18:15 ` Eric Blake
2020-04-14 15:00 ` Kevin Wolf
2020-04-09 15:30 ` [PATCH for-5.1 8/8] qemu-option: Move is_valid_option_list() to qemu-img.c and rewrite Markus Armbruster
2020-04-09 19:45 ` Eric Blake
2020-04-14 8:47 ` Markus Armbruster
2020-04-14 14:34 ` Markus Armbruster
2020-04-14 15:10 ` Kevin Wolf
2020-04-14 20:14 ` Markus Armbruster
2020-04-09 17:09 ` [PATCH for-5.1 0/8] qemu-option: Fix corner cases and clean up no-reply
2020-04-09 17:44 ` Eric Blake
2020-04-14 8:52 ` 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=871roqwfhn.fsf@dusky.pond.sub.org \
--to=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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).