From: Anthony Liguori <aliguori@us.ibm.com>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>,
Eric Blake <eblake@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Gerd Hoffman <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 7/9] qmp: expose a command to query capabilities of config parser
Date: Mon, 19 Mar 2012 10:09:21 -0500 [thread overview]
Message-ID: <1332169763-30665-8-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1332169763-30665-1-git-send-email-aliguori@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
qapi-schema.json | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
qemu-config.c | 51 +++++++++++++++++++++++++++++++++++++++++
qmp-commands.hx | 5 ++++
3 files changed, 122 insertions(+), 0 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 04fa84f..2a80ef6 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1663,3 +1663,69 @@
{ 'command': 'qom-list-types',
'data': { '*implements': 'str', '*abstract': 'bool' },
'returns': [ 'ObjectTypeInfo' ] }
+
+##
+# @ConfigOptionType
+#
+# An enumeration describing the type of a configuration file entry.
+#
+# @string: a UTF-8 string
+#
+# @bool: either 'on' or 'off'
+#
+# @number: an integer
+#
+# @size: an integer followed by either 'K', 'M', 'G', or 'T'.
+#
+# Since: 1.1
+##
+{ 'enum': 'ConfigOptionType'
+ 'data': [ 'string', 'bool', 'number', 'size' ] }
+
+##
+# @ConfigOption
+#
+# An option within a configuration section.
+#
+# @name: the name of the configuration option
+#
+# @type: the type of the configuration option
+#
+# @help: an optional help description. This should not be parsed or relied upon
+# in any way. Its content's may change in future versions of QEMU.
+#
+# Since: 1.1
+##
+{ 'type': 'ConfigOption',
+ 'data': { 'name': 'str',
+ 'type': 'ConfigOptionType',
+ '*help': 'str' } }
+
+##
+# @ConfigSection
+#
+# A section within a configuration file.
+#
+# @name: the section name
+#
+# @parameters: a list of supported parameters
+#
+# Since: 1.1
+##
+{ 'type': 'ConfigSection',
+ 'data': { 'name': 'str',
+ 'parameters': [ 'ConfigOption' ] } }
+
+##
+# @query-config-capabilities
+#
+# Returns the current set of capabilities supported by the various QEMU commands
+# that work with configuration files.
+#
+# Returns: a list of @ConfigSections describe the currently supported
+# configuration sections.
+#
+# Since: 1.1
+##
+{ 'command': 'query-config-capabilities',
+ 'returns': [ 'ConfigSection' ] }
diff --git a/qemu-config.c b/qemu-config.c
index 5856e5a..447aad6 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -2,6 +2,7 @@
#include "qemu-error.h"
#include "qemu-option.h"
#include "qemu-config.h"
+#include "qmp-commands.h"
#include "hw/qdev.h"
#include "gdbstub.h"
#include "net.h"
@@ -866,3 +867,53 @@ int qemu_read_config_file(const char *filename)
{
return qemu_config_parse(vm_config_groups, filename);
}
+
+ConfigSectionList *qmp_query_config_capabilities(Error **errp)
+{
+ ConfigSectionList *lst = NULL;
+ int i;
+
+ for (i = 0; vm_config_groups[i]; i++) {
+ QemuOptsList *olist = vm_config_groups[i];
+ ConfigSection *s = g_malloc0(sizeof(*s));
+ ConfigSectionList *e = g_malloc0(sizeof(*e));
+ QemuOptDesc *desc;
+
+ s->name = g_strdup(olist->name);
+ for (desc = olist->desc; desc->name; desc++) {
+ ConfigOption *o = g_malloc0(sizeof(*o));
+ ConfigOptionList *oe = g_malloc0(sizeof(*oe));
+
+ o->name = g_strdup(desc->name);
+ switch (desc->type) {
+ case QEMU_OPT_STRING:
+ o->type = CONFIG_OPTION_TYPE_STRING;
+ break;
+ case QEMU_OPT_BOOL:
+ o->type = CONFIG_OPTION_TYPE_BOOL;
+ break;
+ case QEMU_OPT_NUMBER:
+ o->type = CONFIG_OPTION_TYPE_NUMBER;
+ break;
+ case QEMU_OPT_SIZE:
+ o->type = CONFIG_OPTION_TYPE_SIZE;
+ break;
+ }
+
+ if (desc->help) {
+ o->has_help = true;
+ o->help = g_strdup(desc->help);
+ }
+
+ oe->value = o;
+ oe->next = s->parameters;
+ s->parameters = oe;
+ }
+
+ e->value = s;
+ e->next = lst;
+ lst = e;
+ }
+
+ return lst;
+}
diff --git a/qmp-commands.hx b/qmp-commands.hx
index dfe8a5b..8024995 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2125,3 +2125,8 @@ EQMP
.args_type = "implements:s?,abstract:b?",
.mhandler.cmd_new = qmp_marshal_input_qom_list_types,
},
+ {
+ .name = "query-config-capabilities",
+ .args_type = "",
+ .mhandler.cmd_new = qmp_marshal_input_query_config_capabilities,
+ },
--
1.7.5.4
next prev parent reply other threads:[~2012-03-19 15:10 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 15:09 [Qemu-devel] [RFC PATCH 0/9] qemu capabilities reporting and config changes Anthony Liguori
2012-03-19 15:09 ` [Qemu-devel] [PATCH 1/9] qemu-config: fix -writeconfig when using qemu_opt_set_bool Anthony Liguori
2012-03-19 15:09 ` [Qemu-devel] [PATCH 2/9] qemu-config: friends don't let friends use sscanf Anthony Liguori
2012-03-19 15:09 ` [Qemu-devel] [PATCH 3/9] vl: refactor command line parsing to allow options to be set via config Anthony Liguori
2012-03-19 15:09 ` [Qemu-devel] [PATCH 4/9] vl: mark system configuration options in qemu-options.hx Anthony Liguori
2012-03-19 15:09 ` [Qemu-devel] [PATCH 5/9] vl: enable system configuration to be used Anthony Liguori
2012-03-19 15:09 ` [Qemu-devel] [PATCH 6/9] vl: parse all options via QemuOpts Anthony Liguori
2012-03-19 15:09 ` Anthony Liguori [this message]
2012-03-19 20:10 ` [Qemu-devel] [PATCH 7/9] qmp: expose a command to query capabilities of config parser Eric Blake
2012-03-19 20:19 ` Anthony Liguori
2012-03-19 20:31 ` Eric Blake
2012-03-19 20:41 ` Anthony Liguori
2012-03-19 15:09 ` [Qemu-devel] [PATCH 8/9] vl: add -query-capabilities Anthony Liguori
2012-03-20 7:49 ` Gerd Hoffmann
2012-03-20 10:33 ` Daniel P. Berrange
2012-03-20 19:39 ` Eduardo Habkost
2012-03-19 15:09 ` [Qemu-devel] [PATCH 9/9] Add a management tool writer's guide Anthony Liguori
2012-03-19 16:09 ` [Qemu-devel] [RFC PATCH 0/9] qemu capabilities reporting and config changes Paolo Bonzini
2012-03-19 16:31 ` Anthony Liguori
2012-03-19 16:33 ` Paolo Bonzini
2012-03-19 16:41 ` Anthony Liguori
2012-03-19 16:45 ` Paolo Bonzini
2012-03-19 16:53 ` Anthony Liguori
2012-03-19 17:03 ` Paolo Bonzini
2012-03-20 7:54 ` Gerd Hoffmann
2012-03-20 19:47 ` Eduardo Habkost
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=1332169763-30665-8-git-send-email-aliguori@us.ibm.com \
--to=aliguori@us.ibm.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).