On Tue, Apr 29, 2014 at 05:08:13PM +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 <wdon...@linux.vnet.ibm.com>
> Signed-off-by: Chunyan Liu <cy...@suse.com>
Reviewed-by: Leandro Dorileo <l...@dorileo.org>
> ---
> Changes to V25:
> * update @default description in .json file
>
> qapi-schema.json | 5 ++++-
> qmp-commands.hx | 2 ++
> util/qemu-config.c | 4 ++++
> 3 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 0b00427..880829d 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -4088,12 +4088,15 @@
> #
> # @help: #optional human readable text string, not suitable for parsing.
> #
> +# @default: #optional default value string (since 2.1)
> +#
> # 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 ed3ab92..1271332 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -2895,6 +2895,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 f4e4f38..ba375c0 100644
> --- a/util/qemu-config.c
> +++ b/util/qemu-config.c
> @@ -82,6 +82,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;
> --
> 1.8.4.5
>
>
--
Leandro Dorileo
