From patchwork Fri Jul 2 21:27:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Di Ciurcio Filho X-Patchwork-Id: 57781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C4318B708A for ; Sat, 3 Jul 2010 07:43:02 +1000 (EST) Received: from localhost ([127.0.0.1]:36817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUnrF-0001z6-Cm for incoming@patchwork.ozlabs.org; Fri, 02 Jul 2010 17:33:13 -0400 Received: from [140.186.70.92] (port=50393 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OUnmB-0008PP-S9 for qemu-devel@nongnu.org; Fri, 02 Jul 2010 17:31:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OUnlq-0005m4-2r for qemu-devel@nongnu.org; Fri, 02 Jul 2010 17:27:39 -0400 Received: from mail-gx0-f173.google.com ([209.85.161.173]:57867) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OUnlp-0005lv-Qw for qemu-devel@nongnu.org; Fri, 02 Jul 2010 17:27:38 -0400 Received: by gxk19 with SMTP id 19so1282010gxk.4 for ; Fri, 02 Jul 2010 14:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=Lfotx1V0teDhDJXjcLJFgeUCscziiWK5LfpK0R/HEKQ=; b=OnJfFKWaEVxSn+pgen+BAR3xzP3MZGBQ4PfjehwEl8uB3w1Flle0CcvQz6ON2WevsV T+mdmHWhCaUKOG40ERi/XFsN3QCCNncajaBz2KfJSgFMQFN2yzg8Iy/NJDQF8DGTcy7n ZQB2azMPUMRI8YaVgh6ya5DTuJHtME2s9xi6s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=tn5DabqD3i95650LsGxYytq+3eSYSseoDuAXQrhhq+gdFQ8tXw2mCt8PAEP5x/3GJN 3wSyDt7gewEB1H/9bs4hedmwBB2CWWRfaEIpSKemckAbHxzdLrsgxi5AbqQ8O4dYy6+A /W41jXeGZMwmGB9Sd56mSFD9Oz2g2cKpQ7C3w= Received: by 10.100.191.19 with SMTP id o19mr1630320anf.11.1278106056121; Fri, 02 Jul 2010 14:27:36 -0700 (PDT) Received: from localhost.localdomain ([189.61.231.202]) by mx.google.com with ESMTPS id w4sm2468445ybl.10.2010.07.02.14.27.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 02 Jul 2010 14:27:35 -0700 (PDT) From: Miguel Di Ciurcio Filho To: qemu-devel@nongnu.org Date: Fri, 2 Jul 2010 18:27:03 -0300 Message-Id: <1278106023-9966-3-git-send-email-miguel.filho@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278106023-9966-1-git-send-email-miguel.filho@gmail.com> References: <1278106023-9966-1-git-send-email-miguel.filho@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: armbru@redhat.com, lcapitulino@redhat.com, Miguel Di Ciurcio Filho , avi@redhat.com Subject: [Qemu-devel] [PATCH 2/2] monitor: Convert 'info qdm' to QMP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- hw/qdev.h | 3 +- monitor.c | 3 +- 3 files changed, 120 insertions(+), 4 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 61f999c..23f0540 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; @@ -777,13 +778,126 @@ 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_UNSPEC: + return "unknown"; + case PROP_TYPE_UINT8: + return "uint8"; + case PROP_TYPE_UINT16: + return "uint16"; + case PROP_TYPE_UINT32: + return "uint32"; + case PROP_TYPE_INT32: + return "int32"; + case PROP_TYPE_UINT64: + return "uint64"; + case PROP_TYPE_TADDR: + return "taddr"; + case PROP_TYPE_MACADDR: + return "macaddr"; + case PROP_TYPE_DRIVE: + return "drive"; + case PROP_TYPE_CHR: + return "chr"; + case PROP_TYPE_STRING: + return "string"; + case PROP_TYPE_NETDEV: + return "netdev"; + case PROP_TYPE_VLAN: + return "vlan"; + case PROP_TYPE_PTR: + return "pointer"; + case PROP_TYPE_BIT: + return "bit"; + } + + 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 Properties without a parser are just for dirty hacks. + * qdev_prop_ptr is the only such PropertyInfo. It's marked + * for removal. This conditional should be removed along with + * it. + */ + if (!prop->info->parse) { + continue; /* no way to set it, don't show */ + } + + const char *type = qdev_property_type_to_string(prop->info->type); + + entry = qobject_from_jsonf("{ 'name': %s, 'info': %s, 'type': %s }", + prop->name, prop->info->name, type); + + qlist_append_obj(props, entry); + } + + obj = qobject_from_jsonf("{ 'name': %s, 'bus': %s, 'props': %p, 'creatable': %i }", + info->name, + info->bus_info->name, + props, + info->no_user ? 0 : 1); + + dev = qobject_to_qdict(obj); + + 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 be5ad67..f44e4a2 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -181,7 +181,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 170b269..91b87f9 100644 --- a/monitor.c +++ b/monitor.c @@ -2550,7 +2550,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",