From patchwork Wed Jul 17 09:29:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 259662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B841C2C0091 for ; Wed, 17 Jul 2013 19:43:26 +1000 (EST) Received: from localhost ([::1]:43017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UzOGa-0003Lo-OP for incoming@patchwork.ozlabs.org; Wed, 17 Jul 2013 05:43:24 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=ATn8x7zdcjDgA2vf7oeMXbXEEP4DHwsSztnP5mhzx8U=; b=FA7iIwt8hKUB0vCzPPqz1SdOtSyGab5eWo7uP13Ow2ZeLBxQ3Ql6Ita389qxn2lKtf +tZeQBJQ3Ho1jwSacB9iu6SfjQq2gmKzX8/6pFjyAOFu5gLOsC3e1DCYZHL9QZspllg4 Q4xTkQ8wfDx4EAgQkQqqMLxJYoOUJzurMuXGgHI4YsNuY+gLsp+zPCwVmE9uBTBdmSP9 iWvv6cDjujR5bm/8Ny1K8n+wgEebsQ3hA0x7FOxfWT/ZyqoMioTcIxG55jnDnioEzDmL FrDPXbdnMFJBe3GiUjouolWnew/GslE2/inknOfen33sIvsKyd8chuQPvMs1LEl829mR KuFw== X-Received: by 10.66.121.170 with SMTP id ll10mr6822566pab.126.1374053428780; Wed, 17 Jul 2013 02:30:28 -0700 (PDT) Received: from 11.wdongxu.kvm58 ([202.108.130.153]) by mx.google.com with ESMTPSA id ie3sm6850075pbc.13.2013.07.17.02.30.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Jul 2013 02:30:28 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2013 17:29:45 +0800 Message-Id: <1374053388-17431-7-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 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> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c01::22a Cc: kwolf@redhat.com, wdongxu@cn.ibm.com, stefanha@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V17 6/9] qapi: query-command-line-options outputs def_value_str X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;