Patchwork [V17,6/9] qapi: query-command-line-options outputs def_value_str

login
register
mail settings
Submitter Robert Wang
Date July 17, 2013, 9:29 a.m.
Message ID <1374053388-17431-7-git-send-email-wdongxu@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/259662/
State New
Headers show

Comments

Robert Wang - July 17, 2013, 9:29 a.m.
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 <wdongxu@linux.vnet.ibm.com>
---
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(-)

Patch

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;