From patchwork Thu Jan 21 21:15:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 43465 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 A74FFB7CFA for ; Fri, 22 Jan 2010 09:00:45 +1100 (EST) Received: from localhost ([127.0.0.1]:46584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY545-0001PB-20 for incoming@patchwork.ozlabs.org; Thu, 21 Jan 2010 16:59:45 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NY4Ns-0005rg-1S for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:16:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NY4Nn-0005n3-Tr for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:16:07 -0500 Received: from [199.232.76.173] (port=44121 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NY4Nn-0005mw-Ky for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:16:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34011) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NY4Nn-0003SP-4i for qemu-devel@nongnu.org; Thu, 21 Jan 2010 16:16:03 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0LLG20H001412 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 21 Jan 2010 16:16:02 -0500 Received: from localhost (vpn-9-176.rdu.redhat.com [10.11.9.176]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0LLG0uc010137 for ; Thu, 21 Jan 2010 16:16:01 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 21 Jan 2010 19:15:41 -0200 Message-Id: <1264108541-4071-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1264108541-4071-1-git-send-email-lcapitulino@redhat.com> References: <1264108541-4071-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 4/4] PCI: do_pci_info(): PCI bridge devices support 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 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 | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index ffe4cfe..b83fd53 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1183,7 +1183,15 @@ 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")) { + qdict = qdict_get_qdict(device, "pci_bridge"); + if (qdict_haskey(qdict, "devices")) { + QListEntry *dev; + 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) @@ -1261,7 +1269,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; @@ -1300,6 +1310,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); } @@ -1318,7 +1334,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)); } } @@ -1371,6 +1387,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 (optional) * - "regions": a QList of QDicts, each QDict represents a * memory region of this device *