From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTJnI-0008W9-27 for qemu-devel@nongnu.org; Fri, 08 Jan 2010 13:42:44 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTJnC-0008OQ-Mj for qemu-devel@nongnu.org; Fri, 08 Jan 2010 13:42:42 -0500 Received: from [199.232.76.173] (port=47708 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTJnC-0008O2-EO for qemu-devel@nongnu.org; Fri, 08 Jan 2010 13:42:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5808) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTJnB-0007TO-Qw for qemu-devel@nongnu.org; Fri, 08 Jan 2010 13:42:38 -0500 From: Luiz Capitulino Date: Fri, 8 Jan 2010 16:42:16 -0200 Message-Id: <1262976136-31852-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1262976136-31852-1-git-send-email-lcapitulino@redhat.com> References: <1262976136-31852-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 5/5] PCI: do_pci_info(): PCI bridge devices support List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, mst@redhat.com This commit completes the do_pci_info() conversion to QObject by adding support to PCI bridge devices. This is done by recursively adding devices in the "pci_bridge" key. IMPORTANT: This code is being added separately because I could NOT test it properly. According to Michael Tsirkin, it depends on ultrasparc and it would take time to do the proper setup. Signed-off-by: Luiz Capitulino --- hw/pci.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index d5e4866..82eec09 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1184,7 +1184,14 @@ static void pci_device_print(Monitor *mon, QDict *device) monitor_printf(mon, " id \"%s\"\n", qdict_get_str(device, "qdev_id")); - /* TODO: PCI bridge devices */ + if (qdict_haskey(device, "pci_bridge")) { + QListEntry *dev; + + qdict = qdict_get_qdict(device, "pci_bridge"); + QLIST_FOREACH_ENTRY(qdict_get_qlist(qdict, "devices"), dev) { + pci_device_print(mon, qobject_to_qdict(qlist_entry_obj(dev))); + } + } } void do_pci_info_print(Monitor *mon, const QObject *data) @@ -1258,7 +1265,9 @@ static QObject *pci_get_regions_list(const PCIDevice *dev) return QOBJECT(regions_list); } -static QObject *pci_get_dev_dict(PCIDevice *dev, int bus_num) +static QObject *pci_get_devices_list(PCIBus *bus, int bus_num); + +static QObject *pci_get_dev_dict(PCIDevice *dev, PCIBus *bus, int bus_num) { int class; QObject *obj; @@ -1297,6 +1306,12 @@ static QObject *pci_get_dev_dict(PCIDevice *dev, int bus_num) pci_bridge_get_limit(dev, PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_PREFETCH)); + if (dev->config[0x19] != 0) { + qdict = qobject_to_qdict(pci_bridge); + qdict_put_obj(qdict, "devices", + pci_get_devices_list(bus, dev->config[0x19])); + } + qdict = qobject_to_qdict(obj); qdict_put_obj(qdict, "pci_bridge", pci_bridge); } @@ -1315,7 +1330,7 @@ static QObject *pci_get_devices_list(PCIBus *bus, int bus_num) for (devfn = 0; devfn < ARRAY_SIZE(bus->devices); devfn++) { dev = bus->devices[devfn]; if (dev) { - qlist_append_obj(dev_list, pci_get_dev_dict(dev, bus_num)); + qlist_append_obj(dev_list, pci_get_dev_dict(dev, bus, bus_num)); } } @@ -1368,6 +1383,7 @@ static QObject *pci_get_bus_dict(PCIBus *bus, int bus_num) * - "io_range": a QDict with memory range information * - "memory_range": a QDict with memory range information * - "prefetchable_range": a QDict with memory range information + * - "devices": a QList of PCI devices if there's any attached * - "regions": a QList of QDicts, each QDict represents a * memory region of this device * -- 1.6.6