From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzOAl-000356-ND for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:37:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UzOAj-0005s6-8P for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:37:23 -0400 Received: from mail-pb0-x22a.google.com ([2607:f8b0:400e:c01::22a]:43517) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzO45-0003Yg-Gw for qemu-devel@nongnu.org; Wed, 17 Jul 2013 05:30:29 -0400 Received: by mail-pb0-f42.google.com with SMTP id un1so1702287pbc.29 for ; Wed, 17 Jul 2013 02:30:28 -0700 (PDT) Sender: Dong Xu Wang From: Dong Xu Wang Date: Wed, 17 Jul 2013 17:29:45 +0800 Message-Id: <1374053388-17431-7-git-send-email-wdongxu@linux.vnet.ibm.com> In-Reply-To: <1374053388-17431-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1374053388-17431-1-git-send-email-wdongxu@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V17 6/9] qapi: query-command-line-options outputs def_value_str List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, wdongxu@cn.ibm.com, stefanha@redhat.com, Dong Xu Wang 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 --- 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