[Qemu-devel] [PATCH 7/9] qmp: expose a command to query capabilities of config parser

[Anthony Liguori]

Signed-off-by: Anthony Liguori <address@hidden>
---
 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