From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54729 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OatZA-0001p8-7n for qemu-devel@nongnu.org; Mon, 19 Jul 2010 12:51:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OatZ9-0006Tv-4c for qemu-devel@nongnu.org; Mon, 19 Jul 2010 12:51:44 -0400 Received: from mail-gw0-f45.google.com ([74.125.83.45]:53093) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OatZ9-0006Tn-0C for qemu-devel@nongnu.org; Mon, 19 Jul 2010 12:51:43 -0400 Received: by gwj21 with SMTP id 21so2219242gwj.4 for ; Mon, 19 Jul 2010 09:51:42 -0700 (PDT) From: Miguel Di Ciurcio Filho Date: Mon, 19 Jul 2010 13:51:27 -0300 Message-Id: <1279558287-9446-3-git-send-email-miguel.filho@gmail.com> In-Reply-To: <1279558287-9446-1-git-send-email-miguel.filho@gmail.com> References: <1279558287-9446-1-git-send-email-miguel.filho@gmail.com> Subject: [Qemu-devel] [PATCH v3 2/2] monitor: Convert 'info qdm' to QMP List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, lcapitulino@redhat.com, Miguel Di Ciurcio Filho , avi@redhat.com Converts the 'info qdm' command to QMP, allowing the discovery of all devices known to the QEMU binary without relying on command line paramaters like -device ? and -device devtype,? This change does not modify the output of the 'info qdm' monitor command. Signed-off-by: Miguel Di Ciurcio Filho --- hw/qdev.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/qdev.h | 3 +- monitor.c | 3 +- 3 files changed, 112 insertions(+), 4 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index e99c73f..d24d42a 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; @@ -779,13 +780,118 @@ void do_info_qtree(Monitor *mon) qbus_print(mon, main_system_bus, 0); } -void do_info_qdm(Monitor *mon) +static void qdm_list_iter(QObject *obj, void *opaque) +{ + + Monitor *mon = opaque; + QDict *dev = qobject_to_qdict(obj); + + monitor_printf(mon, "name \"%s\", bus %s", qdict_get_str(dev, "name"), + qdict_get_str(dev, "bus")); + + if (qdict_haskey(dev, "alias")) { + monitor_printf(mon, ", alias \"%s\"", qdict_get_str(dev, "alias")); + } + + if (qdict_haskey(dev, "description")) { + monitor_printf(mon, ", desc \"%s\"", qdict_get_str(dev, "description")); + } + + if (!qdict_get_bool(dev, "creatable")) { + monitor_printf(mon, ", no-user"); + } + + monitor_printf(mon, "\n"); +} + +void do_info_qdm_print(Monitor *mon, const QObject *ret_data) +{ + QList *devs; + + devs = qobject_to_qlist(ret_data); + qlist_iter(devs, qdm_list_iter, 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"; + case PROP_TYPE_UNSPEC: + case PROP_TYPE_VLAN: + case PROP_TYPE_PTR: + return NULL; + } + + return NULL; +} + +void do_info_qdm(Monitor *mon, QObject **ret_data) { DeviceInfo *info; + QList *devs = qlist_new(); for (info = device_info_list; info != NULL; info = info->next) { - qdev_print_devinfo(info); + QObject *obj; + QDict *dev; + QList *props = qlist_new(); + Property *prop; + + 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; + } + + const char *type = qdev_property_type_to_string(prop->info->type); + + 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); + } + + 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) diff --git a/hw/qdev.h b/hw/qdev.h index 678f8b7..3b0382b 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -184,7 +184,8 @@ void qbus_free(BusState *bus); /*** monitor commands ***/ void do_info_qtree(Monitor *mon); -void do_info_qdm(Monitor *mon); +void do_info_qdm_print(Monitor *mon, const QObject *ret_data); +void do_info_qdm(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..66810f2 100644 --- a/monitor.c +++ b/monitor.c @@ -2565,7 +2565,8 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show qdev device model list", - .mhandler.info = do_info_qdm, + .user_print = do_info_qdm_print, + .mhandler.info_new = do_info_qdm, }, { .name = "roms", -- 1.7.1