From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwV2e-00038f-2e for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:25:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwV2Z-0001hV-LJ for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:25:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwV2Z-0001hI-CN for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:25:31 -0400 From: Stefan Hajnoczi Date: Mon, 16 Jun 2014 19:23:34 +0800 Message-Id: <1402917843-6459-11-git-send-email-stefanha@redhat.com> In-Reply-To: <1402917843-6459-1-git-send-email-stefanha@redhat.com> References: <1402917843-6459-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 10/39] 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: Peter Maydell , Dong Xu Wang , Chunyan Liu , Stefan Hajnoczi From: Chunyan Liu Change qapi interfaces to output the newly added def_value_str when querying command line options. Reviewed-by: Stefan Hajnoczi Reviewed-by: Eric Blake Reviewed-by: Leandro Dorileo Signed-off-by: Dong Xu Wang Signed-off-by: Chunyan Liu Signed-off-by: Stefan Hajnoczi --- 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 14b498b..dc2abe4 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2855,12 +2855,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.9.3