| Message ID | 1392978948-27416-3-git-send-email-cyliu@suse.com |
|---|---|
| State | New |
| Headers | show |
On 02/21/2014 03:35 AM, Chunyan Liu wrote: > Change qapi interfaces to output the newly added def_value_str when querying > command line options. > > Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com> > Signed-off-by: Chunyan Liu <cyliu@suse.com> > --- > qapi-schema.json | 8 ++++++-- > qmp-commands.hx | 2 ++ > util/qemu-config.c | 4 ++++ > 3 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 473c096..83e5870 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -4010,12 +4010,16 @@ > # > # @help: #optional human readable text string, not suitable for parsing. > # > -# Since 1.5 > +# @default: #optional string representation of the default used > +# if the option is omitted. > +# > +# Since 2.0 Not quite right. This needs to be: # @help: #optional human readable text string, not suitable for parsing. # # @default: #optional string representation of the default used # if the option is omitted (since 2.0). # # Since 1.5
2014-03-04 8:02 GMT+08:00 Eric Blake <eblake@redhat.com>: > On 02/21/2014 03:35 AM, Chunyan Liu wrote: > > Change qapi interfaces to output the newly added def_value_str when > querying > > command line options. > > > > Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com> > > Signed-off-by: Chunyan Liu <cyliu@suse.com> > > --- > > qapi-schema.json | 8 ++++++-- > > qmp-commands.hx | 2 ++ > > util/qemu-config.c | 4 ++++ > > 3 files changed, 12 insertions(+), 2 deletions(-) > > > > diff --git a/qapi-schema.json b/qapi-schema.json > > index 473c096..83e5870 100644 > > --- a/qapi-schema.json > > +++ b/qapi-schema.json > > @@ -4010,12 +4010,16 @@ > > # > > # @help: #optional human readable text string, not suitable for parsing. > > # > > -# Since 1.5 > > +# @default: #optional string representation of the default used > > +# if the option is omitted. > > +# > > +# Since 2.0 > > Not quite right. This needs to be: > > # @help: #optional human readable text string, not suitable for parsing. > # > # @default: #optional string representation of the default used > # if the option is omitted (since 2.0). > # > # Since 1.5 > Thanks, will update. > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org > >
diff --git a/qapi-schema.json b/qapi-schema.json index 473c096..83e5870 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4010,12 +4010,16 @@ # # @help: #optional human readable text string, not suitable for parsing. # -# Since 1.5 +# @default: #optional string representation of the default used +# if the option is omitted. +# +# Since 2.0 ## { 'type': 'CommandLineParameterInfo', 'data': { 'name': 'str', 'type': 'CommandLineParameterType', - '*help': 'str' } } + '*help': 'str', + '*default': 'str' } } ## # @CommandLineOptionInfo: diff --git a/qmp-commands.hx b/qmp-commands.hx index 8a0e832..9b89d6c 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2833,6 +2833,8 @@ Each array entry contains the following: or 'size') - "help": human readable description of the parameter (json-string, optional) + - "default": default value string for the parameter + (json-string, optional) Example: diff --git a/util/qemu-config.c b/util/qemu-config.c index 797df71..c6e7db6 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -68,6 +68,10 @@ static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc) info->has_help = true; info->help = g_strdup(desc[i].help); } + if (desc[i].def_value_str) { + info->has_q_default = true; + info->q_default = g_strdup(desc[i].def_value_str); + } entry = g_malloc0(sizeof(*entry)); entry->value = info;