[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V17 6/9] qapi: query-command-line-options outputs de
From: |
Dong Xu Wang |
Subject: |
[Qemu-devel] [PATCH V17 6/9] qapi: query-command-line-options outputs def_value_str |
Date: |
Wed, 17 Jul 2013 17:29:45 +0800 |
QMP command query-command-line-options shows details information of
parameters, since added def_value_str, also output it in the QMP
command.
Signed-off-by: Dong Xu Wang <address@hidden>
---
v16->v17:
1) add "Since 1.6" tag.
2) rename def_str_value to "default".
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 7b9fef1..cb9098c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3612,12 +3612,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 1.6
##
{ '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 e075df4..a88f310 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2571,6 +2571,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 a59568d..315ecbf 100644
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -67,6 +67,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.11.7
- [Qemu-devel] [PATCH V17 3/9] qemu-option: create four QemuOptsList related functions, (continued)
- [Qemu-devel] [PATCH V17 3/9] qemu-option: create four QemuOptsList related functions, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 9/9] qemu-option: use qemu_opts_del without judging NULL, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 4/9] qemu-option: create some QemuOpts functons, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 7/9] qemu-option: remove QEMUOptionParameter related functions and struct, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 8/9] qemu-option: make qemu_opts_del accept opts being NULL, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 5/9] block: use QemuOpts support in block layer, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 2/9] qemu-option: avoid duplication of default value in QemuOpts, Dong Xu Wang, 2013/07/17
- [Qemu-devel] [PATCH V17 6/9] qapi: query-command-line-options outputs def_value_str,
Dong Xu Wang <=
- Re: [Qemu-devel] [PATCH V17 0/9] replace QEMUOptionParameter with QemuOpts parser, Eric Blake, 2013/07/17