From: Paolo Bonzini <pbonzini@redhat.com>
To: Eduardo Habkost <ehabkost@redhat.com>
Cc: qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] qemu-config: Accept empty option values
Date: Thu, 09 Apr 2015 21:11:12 +0200 [thread overview]
Message-ID: <5526CED0.9050503@redhat.com> (raw)
In-Reply-To: <20150409185059.GC18590@thinpad.lan.raisama.net>
On 09/04/2015 20:50, Eduardo Habkost wrote:
> On Thu, Apr 09, 2015 at 02:11:11PM +0200, Paolo Bonzini wrote:
>> On 08/04/2015 20:16, Eduardo Habkost wrote:
>>> Currently it is impossible to set an option in a config file to an empty
>>> string, because the parser matches only lines containing non-empty
>>> strings between double-quotes.
>>>
>>> As sscanf() "[" conversion specifier only matches non-empty strings, add
>>> a special case for empty strings.
>>>
>>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>>> ---
>>> util/qemu-config.c | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/util/qemu-config.c b/util/qemu-config.c
>>> index 2d32ce7..9f9577d 100644
>>> --- a/util/qemu-config.c
>>> +++ b/util/qemu-config.c
>>> @@ -413,7 +413,8 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname)
>>> opts = qemu_opts_create(list, NULL, 0, &error_abort);
>>> continue;
>>> }
>>> - if (sscanf(line, " %63s = \"%1023[^\"]\"", arg, value) == 2) {
>>> + if (sscanf(line, " %63s = \"%1023[^\"]\"", arg, value) == 2 ||
>>> + (value[0] = '\0', sscanf(line, " %63s = \"\"", arg) == 1)) {
>>> /* arg = value */
>>> if (opts == NULL) {
>>> error_report("no group defined");
>>>
>>
>> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>
> Thanks! Whose tree this should go through?
Acked-by generally means that you're welcome to take it through yours.
My "misc" tree hosts non-trivial patches outside well-defined
maintainership area, but it's less work to carry patches only from
people who don't send pull requests. Maybe it's not the case of this
patch, but using your own tree also means that it's simpler for you to
sort out the dependencies.
Paolo
prev parent reply other threads:[~2015-04-09 19:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-08 18:16 [Qemu-devel] [PATCH] qemu-config: Accept empty option values Eduardo Habkost
2015-04-08 23:03 ` Eric Blake
2015-04-09 12:11 ` Paolo Bonzini
2015-04-09 18:50 ` Eduardo Habkost
2015-04-09 19:11 ` Paolo Bonzini [this message]
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=5526CED0.9050503@redhat.com \
--to=pbonzini@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kraxel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.