diff options
| author | Chunyan Liu <cyliu@suse.com> | 2014-06-05 17:20:43 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-16 17:23:20 +0800 |
| commit | e36af94f868fe5b897c4903126e11fdf25fa4739 (patch) | |
| tree | cddfca71a8c41cd8411d7d9a7cff7a7828bf60d1 | |
| parent | 09722032e15669e653991923613761602c745fa0 (diff) | |
| download | focaccia-qemu-e36af94f868fe5b897c4903126e11fdf25fa4739.tar.gz focaccia-qemu-e36af94f868fe5b897c4903126e11fdf25fa4739.zip | |
qapi: output def_value_str when query command line options
Change qapi interfaces to output the newly added def_value_str when querying command line options. Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Leandro Dorileo <l@dorileo.org> Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com> Signed-off-by: Chunyan Liu <cyliu@suse.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | qapi-schema.json | 5 | ||||
| -rw-r--r-- | qmp-commands.hx | 2 | ||||
| -rw-r--r-- | util/qemu-config.c | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 14b498b442..dc2abe479e 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2855,12 +2855,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 d8aa4edabe..d6bb0f483f 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2898,6 +2898,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 f4e4f38749..ba375c0148 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; |