[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/8] pci: Use helper o find device's root bus in pci
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 4/8] pci: Use helper o find device's root bus in pci_find_domain() |
Date: |
Thu, 9 May 2013 10:31:08 +1000 |
Currently pci_find_domain() performs two functions - it locates the PCI
root bus above the given bus, then looks up that root bus's domain number.
This patch adds a helper function to perform the first task, finding the
root bus for a given PCI device. This is then used in pci_find_domain().
This changes pci_find_domain()'s signature slightly, taking a PCIDevice
instead of a PCIBus - since all callers passed something of the form
dev->bus, this simplifies things slightly.
Signed-off-by: David Gibson <address@hidden>
---
hw/pci/pci-hotplug-old.c | 2 +-
hw/pci/pci.c | 20 +++++++++++++-------
hw/pci/pcie_aer.c | 3 +--
include/hw/pci/pci.h | 3 ++-
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/hw/pci/pci-hotplug-old.c b/hw/pci/pci-hotplug-old.c
index 55441c6..98b4c18 100644
--- a/hw/pci/pci-hotplug-old.c
+++ b/hw/pci/pci-hotplug-old.c
@@ -274,7 +274,7 @@ void pci_device_hot_add(Monitor *mon, const QDict *qdict)
if (dev) {
monitor_printf(mon, "OK domain %d, bus %d, slot %d, function %d\n",
- pci_find_domain(dev->bus),
+ pci_find_domain(dev),
pci_bus_num(dev->bus), PCI_SLOT(dev->devfn),
PCI_FUNC(dev->devfn));
} else
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 9503d56..f1cee73 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -259,18 +259,24 @@ PCIBus *pci_get_primary_bus(void)
return NULL;
}
-int pci_find_domain(const PCIBus *bus)
+PCIBus *pci_device_root_bus(const PCIDevice *d)
{
- PCIDevice *d;
- struct PCIHostBus *host;
+ PCIBus *bus = d->bus;
- /* obtain root bus */
while ((d = bus->parent_dev) != NULL) {
bus = d->bus;
}
+ return bus;
+}
+
+int pci_find_domain(const PCIDevice *dev)
+{
+ const PCIBus *rootbus = pci_device_root_bus(dev);
+ struct PCIHostBus *host;
+
QLIST_FOREACH(host, &host_buses, next) {
- if (host->bus == bus) {
+ if (host->bus == rootbus) {
return host->domain;
}
}
@@ -2002,7 +2008,7 @@ int pci_add_capability(PCIDevice *pdev, uint8_t cap_id,
fprintf(stderr, "ERROR: %04x:%02x:%02x.%x "
"Attempt to add PCI capability %x at offset "
"%x overlaps existing capability %x at offset %x\n",
- pci_find_domain(pdev->bus), pci_bus_num(pdev->bus),
+ pci_find_domain(pdev), pci_bus_num(pdev->bus),
PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
cap_id, offset, overlapping_cap, i);
return -EINVAL;
@@ -2157,7 +2163,7 @@ static char *pcibus_get_dev_path(DeviceState *dev)
path[path_len] = '\0';
/* First field is the domain. */
- s = snprintf(domain, sizeof domain, "%04x:00", pci_find_domain(d->bus));
+ s = snprintf(domain, sizeof domain, "%04x:00", pci_find_domain(d));
assert(s == domain_len);
memcpy(path, domain, domain_len);
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 1ce72ce..06f77ac 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -1022,8 +1022,7 @@ int do_pcie_aer_inject_error(Monitor *mon,
*ret_data = qobject_from_jsonf("{'id': %s, "
"'domain': %d, 'bus': %d, 'devfn': %d, "
"'ret': %d}",
- id,
- pci_find_domain(dev->bus),
+ id, pci_find_domain(dev),
pci_bus_num(dev->bus), dev->devfn,
ret);
assert(*ret_data);
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 38682e8..1383cfe 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -391,7 +391,8 @@ void pci_for_each_device(PCIBus *bus, int bus_num,
void (*fn)(PCIBus *bus, PCIDevice *d, void *opaque),
void *opaque);
PCIBus *pci_get_primary_bus(void);
-int pci_find_domain(const PCIBus *bus);
+PCIBus *pci_device_root_bus(const PCIDevice *d);
+int pci_find_domain(const PCIDevice *dev);
PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn);
int pci_qdev_find_device(const char *id, PCIDevice **pdev);
PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr);
--
1.7.10.4
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, (continued)
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, David Gibson, 2013/05/23
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, David Gibson, 2013/05/29
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, David Gibson, 2013/05/29
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, Michael S. Tsirkin, 2013/05/29
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, David Gibson, 2013/05/29
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, Michael S. Tsirkin, 2013/05/29
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, David Gibson, 2013/05/29
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, Michael S. Tsirkin, 2013/05/29
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, David Gibson, 2013/05/29
- Re: [Qemu-devel] [PATCH 6/8] pci: Simpler implementation of primary PCI bus, Michael S. Tsirkin, 2013/05/30
[Qemu-devel] [PATCH 4/8] pci: Use helper o find device's root bus in pci_find_domain(),
David Gibson <=
[Qemu-devel] [PATCH 3/8] pci: Abolish pci_find_root_bus(), David Gibson, 2013/05/08
[Qemu-devel] [PATCH 7/8] pci: Remove domain from PCIHostBus, David Gibson, 2013/05/08
[Qemu-devel] [PATCH 8/8] pci: Fold host_buses list into PCIHostState functionality, David Gibson, 2013/05/08
[Qemu-devel] [PATCH 5/8] pci: Replace pci_find_domain() with more general pci_root_bus_path(), David Gibson, 2013/05/08