From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDTNb-0001nl-BI for qemu-devel@nongnu.org; Wed, 12 Feb 2014 01:33:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDTNV-0000pj-BI for qemu-devel@nongnu.org; Wed, 12 Feb 2014 01:33:07 -0500 Received: from victor.provo.novell.com ([137.65.250.26]:60409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDTNV-0000pL-2k for qemu-devel@nongnu.org; Wed, 12 Feb 2014 01:33:01 -0500 From: Chunyan Liu Date: Wed, 12 Feb 2014 14:33:02 +0800 Message-Id: <1392186806-10418-3-git-send-email-cyliu@suse.com> In-Reply-To: <1392186806-10418-1-git-send-email-cyliu@suse.com> References: <1392186806-10418-1-git-send-email-cyliu@suse.com> Subject: [Qemu-devel] [PATCH v20 02/26] qapi: output def_value_str when query command line options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Dong Xu Wang , Chunyan Liu , stefanha@redhat.com Change qapi interfaces to output the newly added def_value_str when query command line options. Signed-off-by: Dong Xu Wang Signed-off-by: Chunyan Liu --- 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 05ced9d..45b40ca 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3930,12 +3930,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 cce6b81..9220a19 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2792,6 +2792,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 9298f55..66295b9 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -68,6 +68,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.6.0.2