[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v28 04/33] qapi: output def_value_str when query com
From: |
Chunyan Liu |
Subject: |
[Qemu-devel] [PATCH v28 04/33] qapi: output def_value_str when query command line options |
Date: |
Thu, 5 Jun 2014 17:20:43 +0800 |
Change qapi interfaces to output the newly added def_value_str when querying
command line options.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
---
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 7bc33ea..ee4d8f4 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4096,12 +4096,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 d8aa4ed..d6bb0f4 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 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.7.12.4
- [Qemu-devel] [PATCH v28 00/33] replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 06/33] QemuOpts: move qemu_opt_del ahead for later calling, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 05/33] QemuOpts: change opt->name|str from (const char *) to (char *), Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 01/33] QemuOpts: move find_desc_by_name ahead for later calling, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 03/33] QemuOpts: add def_value_str to QemuOptDesc, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 08/33] QemuOpts: add qemu_opts_print_help to replace print_option_help, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 04/33] qapi: output def_value_str when query command line options,
Chunyan Liu <=
- [Qemu-devel] [PATCH v28 02/33] QemuOpts: repurpose qemu_opts_print to replace print_option_parameters, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 07/33] QemuOpts: add qemu_opt_get_*_del functions for replace work, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 09/33] QemuOpts: add conversion between QEMUOptionParameter to QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 10/33] QemuOpts: add qemu_opts_append to replace append_option_parameters, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 11/33] QemuOpts: check NULL input for qemu_opts_del, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 15/33] gluster.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 17/33] nfs.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 12/33] change block layer to support both QemuOpts and QEMUOptionParamter, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 14/33] cow.c: replace QEMUOptionParameter with QemuOpts, Chunyan Liu, 2014/06/05
- [Qemu-devel] [PATCH v28 13/33] vvfat.c: handle cross_driver's create_options and create_opts, Chunyan Liu, 2014/06/05