From: Leandro Dorileo <l@dorileo.org>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <famz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Liu Yuan <namei.unix@gmail.com>, Jeff Cody <jcody@redhat.com>,
Markus Armbruster <armbru@redhat.com>, Peter Lieven <pl@kamp.de>,
"Richard W.M. Jones" <rjones@redhat.com>,
Dong Xu Wang <wdongxu@linux.vnet.ibm.com>,
Luiz Capitulino <lcapitulino@redhat.com>,
Chunyan Liu <cyliu@suse.com>, Leandro Dorileo <l@dorileo.org>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
Josh Durgin <josh.durgin@inktank.com>,
Anthony Liguori <anthony@codemonkey.ws>,
Paolo Bonzini <pbonzini@redhat.com>, Stefan Weil <sw@weilnetz.de>,
Max Reitz <mreitz@redhat.com>,
MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>,
Benoit Canet <benoit@irqsave.net>
Subject: [Qemu-devel] [PATCH 01/26] qapi: output def_value_str when query command line options
Date: Thu, 20 Mar 2014 21:13:08 -0300 [thread overview]
Message-ID: <1395360813-2833-2-git-send-email-l@dorileo.org> (raw)
In-Reply-To: <1395360813-2833-1-git-send-email-l@dorileo.org>
From: Chunyan Liu <cyliu@suse.com>
Change qapi interfaces to output the newly added def_value_str when querying
command line options.
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
---
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.9.0
next prev parent reply other threads:[~2014-03-21 0:13 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-21 0:13 [Qemu-devel] [PATCH 00/26] QemuOptionParameter -> QemuOpts migration Leandro Dorileo
2014-03-21 0:13 ` Leandro Dorileo [this message]
2014-03-21 23:15 ` [Qemu-devel] [PATCH 01/26] qapi: output def_value_str when query command line options Eric Blake
2014-03-21 0:13 ` [Qemu-devel] [PATCH 02/26] add def_value_str to QemuOptDesc Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 03/26] QemuOpt: improve default value Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 04/26] QemuOpt: introduce qemu_opts_append() Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 05/26] QemuOpt: add qemu_opt_print_help() Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 06/26] block: migrate block later QemuOptionParameter Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 07/26] cow: migrate cow driver QemuOptionParameter usage Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 08/26] gluster: migrate gluster " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 09/26] iscsi: migrate iscsi " Leandro Dorileo
2014-03-21 6:43 ` Peter Lieven
2014-03-21 13:31 ` Leandro Dorileo
2014-03-21 13:34 ` Leandro Dorileo
2014-03-21 13:42 ` Peter Lieven
2014-03-21 13:54 ` Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 10/26] nfs: migrate nfs " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 11/26] qcow: migrate qcow " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 12/26] qcow2: migrate qcow2 " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 13/26] qed: migrate qed " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 14/26] raw-posix: migrate raw-posix " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 15/26] raw-win32: migrate cow " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 16/26] raw_bsd: migrate raw_bsd " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 17/26] rbd: migrate rbd " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 18/26] sheepdog: migrate sheepdog " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 19/26] ssh: migrate ssh " Leandro Dorileo
2014-03-21 8:32 ` Richard W.M. Jones
2014-03-21 0:13 ` [Qemu-devel] [PATCH 20/26] vdi: migrate vdi " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 21/26] vhdx: migrate vhdx " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 22/26] vmdk: migrate vmdk " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 23/26] vpc: migrate vpc " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 24/26] vvfat: migrate vvfat " Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 25/26] QemuOpt: get rid of QEMUOptionParameter Leandro Dorileo
2014-03-21 0:13 ` [Qemu-devel] [PATCH 26/26] qemu-img: migrate QemuOptionParameter usage Leandro Dorileo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395360813-2833-2-git-send-email-l@dorileo.org \
--to=l@dorileo.org \
--cc=anthony@codemonkey.ws \
--cc=armbru@redhat.com \
--cc=benoit@irqsave.net \
--cc=cyliu@suse.com \
--cc=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=josh.durgin@inktank.com \
--cc=kwolf@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=morita.kazutaka@lab.ntt.co.jp \
--cc=mreitz@redhat.com \
--cc=namei.unix@gmail.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-devel@nongnu.org \
--cc=rjones@redhat.com \
--cc=ronniesahlberg@gmail.com \
--cc=stefanha@redhat.com \
--cc=sw@weilnetz.de \
--cc=wdongxu@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).