Re: [Qemu-devel] [PATCH v24 03/31] qapi: output def_value_str when query command line options

[Leandro Dorileo]

On Thu, Apr 03, 2014 at 05:54:21PM +0800, Chunyan Liu wrote:
> Change qapi interfaces to output the newly added def_value_str when querying
> command line options.
> 
> Reviewed-by: Eric Blake <address@hidden>
> Signed-off-by: Dong Xu Wang <address@hidden>
> Signed-off-by: Chunyan Liu <address@hidden>
> ---
>  qapi-schema.json   | 6 +++++-
>  qmp-commands.hx    | 2 ++
>  util/qemu-config.c | 4 ++++
>  3 files changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 391356f..f04ea18 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -4088,12 +4088,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.1)
> +#


what about #optional option's default value  - set if option not informed
     (since 2.1).

But if you feel comfortable with the current text you can add:

Reviewed-by: Leandro Dorileo <address@hidden>

--
Leandro Dorileo

>  # 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 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;
> -- 
> 1.7.12.4
>