From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQwQu-0005nj-MR for qemu-devel@nongnu.org; Fri, 21 Mar 2014 06:12:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQwQl-0007Q2-25 for qemu-devel@nongnu.org; Fri, 21 Mar 2014 06:12:12 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:47391) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQwQk-0007PU-OQ for qemu-devel@nongnu.org; Fri, 21 Mar 2014 06:12:02 -0400 From: Chunyan Liu Date: Fri, 21 Mar 2014 18:12:14 +0800 Message-Id: <1395396763-26081-4-git-send-email-cyliu@suse.com> In-Reply-To: <1395396763-26081-1-git-send-email-cyliu@suse.com> References: <1395396763-26081-1-git-send-email-cyliu@suse.com> Subject: [Qemu-devel] [PATCH v23 03/32] 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: stefanha@redhat.com Change qapi interfaces to output the newly added def_value_str when querying command line options. Reviewed-by: Eric Blake Signed-off-by: Dong Xu Wang Signed-off-by: Chunyan Liu --- qapi-schema.json | 6 +++++- qmp-commands.hx | 2 ++ util/qemu-config.c | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/qapi-schema.json b/qapi-schema.json index b68cd44..cf9174e 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4088,12 +4088,16 @@ # # @help: #optional human readable text string, not suitable for parsing. # +# @default: #optional string representation of the default used +# if the option is omitted. (since 2.0) +# # 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 a22621f..178aadd 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2895,6 +2895,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 f610101..d608b2f 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.7.12.4