Patchwork [v4,2/3] QMP: Introduce query-available-devices

login
register
mail settings
Submitter Miguel Di Ciurcio Filho
Date July 23, 2010, 4:47 p.m.
Message ID <1279903660-9607-3-git-send-email-miguel.filho@gmail.com>
Download mbox | patch
Permalink /patch/59824/
State New
Headers show

Comments

Miguel Di Ciurcio Filho - July 23, 2010, 4:47 p.m.
---
 hw/qdev.c |   84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 hw/qdev.h |    1 +
 monitor.c |    8 ++++++
 3 files changed, 93 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/qdev.c b/hw/qdev.c
index e99c73f..14985f5 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -29,6 +29,7 @@ 
 #include "qdev.h"
 #include "sysemu.h"
 #include "monitor.h"
+#include "qjson.h"
 
 static int qdev_hotplug = 0;
 
@@ -788,6 +789,89 @@  void do_info_qdm(Monitor *mon)
     }
 }
 
+static const char *qdev_property_type_to_string(int type)
+{
+    switch (type) {
+    case PROP_TYPE_UINT8:
+    case PROP_TYPE_UINT16:
+    case PROP_TYPE_UINT32:
+    case PROP_TYPE_INT32:
+    case PROP_TYPE_UINT64:
+        return "integer";
+    case PROP_TYPE_TADDR:
+    case PROP_TYPE_MACADDR:
+    case PROP_TYPE_DRIVE:
+    case PROP_TYPE_CHR:
+    case PROP_TYPE_STRING:
+    case PROP_TYPE_NETDEV:
+        return "string";
+    case PROP_TYPE_BIT:
+	    return "boolean";
+    }
+
+    return NULL;
+}
+
+void do_available_devices(Monitor *mon, QObject **ret_data)
+{
+    DeviceInfo *info;
+    QList *devs = qlist_new();
+
+    for (info = device_info_list; info != NULL; info = info->next) {
+        QObject *obj;
+        QDict *dev;
+        QList *props = qlist_new();
+        Property *prop;
+        const char *type;
+
+        for (prop = info->props; prop && prop->name; prop++) {
+            QObject *entry;
+            /*
+             * TODO: skip old and hackish stuff, they will be removed some day.
+             */
+            if (!prop->info->parse || prop->info->type == PROP_TYPE_VLAN
+                || prop->info->type == PROP_TYPE_PTR
+                || prop->info->type == PROP_TYPE_UNSPEC) {
+                continue;
+            }
+
+            type = qdev_property_type_to_string(prop->info->type);
+
+            assert(type != NULL);
+
+            entry = qobject_from_jsonf("{ 'name': %s, 'type': %s }",
+                           prop->name, type);
+
+            qlist_append_obj(props, entry);
+        }
+
+        obj = qobject_from_jsonf("{ 'name': %s, 'bus': %s, 'creatable': %i }",
+                     info->name,
+                     info->bus_info->name,
+                     info->no_user ? 0 : 1);
+
+        dev = qobject_to_qdict(obj);
+
+        if (!qlist_empty(props)) {
+            qdict_put(dev, "properties", props);
+        } else {
+            QDECREF(props);
+        }
+
+        if (info->alias) {
+            qdict_put(dev, "alias", qstring_from_str(info->alias));
+        }
+
+        if (info->desc) {
+            qdict_put(dev, "description", qstring_from_str(info->desc));
+        }
+
+        qlist_append(devs, dev);
+    }
+
+    *ret_data = QOBJECT(devs);
+}
+
 int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     QemuOpts *opts;
diff --git a/hw/qdev.h b/hw/qdev.h
index 678f8b7..8c6fa06 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -185,6 +185,7 @@  void qbus_free(BusState *bus);
 
 void do_info_qtree(Monitor *mon);
 void do_info_qdm(Monitor *mon);
+void do_available_devices(Monitor *mon, QObject **ret_data);
 int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
 int do_device_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
diff --git a/monitor.c b/monitor.c
index 45fd482..384d5fc 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2561,6 +2561,14 @@  static const mon_cmd_t info_cmds[] = {
         .mhandler.info = do_info_qtree,
     },
     {
+        .name       = "available-devices",
+        .args_type  = "",
+        .params     = "",
+        .help       = "describes the capabilities of all supported devices",
+        .user_print = monitor_user_noop,
+        .mhandler.info_new = do_available_devices,
+    },
+    {
         .name       = "qdm",
         .args_type  = "",
         .params     = "",