| Message ID | 1394436721-21812-3-git-send-email-cyliu@suse.com |
|---|---|
| State | New |
| Headers | show |
On 03/10/2014 01:31 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 <address@hidden> > Signed-off-by: Chunyan Liu <cyliu@suse.com> > --- > qapi-schema.json | 6 +++++- > qmp-commands.hx | 2 ++ > util/qemu-config.c | 4 ++++ > 3 files changed, 11 insertions(+), 1 deletion(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On Mon, Mar 10, 2014 at 03:31:38PM +0800, 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 <address@hidden> Not a valid email address.
diff --git a/qapi-schema.json b/qapi-schema.json index 6c381b7..f37834e 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4059,12 +4059,16 @@ # # @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 ## { '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 d982cd6..94e8f9f 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2856,6 +2856,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 f610101..d608b2f 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;