diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-01-27 15:56:36 +0900 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-03-28 18:34:22 +0200 |
| commit | 5256d8bfad9b0113dc2f9b57706eaad26b008987 (patch) | |
| tree | 8bb9ff38185905500774ea5040e5de1537e36f28 | |
| parent | 90a20dbb2837f5ff05a9b19659ba1aa218cbd2de (diff) | |
| download | focaccia-qemu-5256d8bfad9b0113dc2f9b57706eaad26b008987.tar.gz focaccia-qemu-5256d8bfad9b0113dc2f9b57706eaad26b008987.zip | |
pci: use devfn for pci_find_device() instead of (slot, fn) pair
(slot, fn) pair is somewhat confusing because of ARI. So use devfn for pci_find_device() instead of (slot, fn). Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/pci-hotplug.c | 5 | ||||
| -rw-r--r-- | hw/pci.c | 4 | ||||
| -rw-r--r-- | hw/pci.h | 2 | ||||
| -rw-r--r-- | hw/pci_host.c | 2 | ||||
| -rw-r--r-- | hw/pcie_host.c | 3 |
5 files changed, 8 insertions, 8 deletions
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 478fe9b836..b59be2a599 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -127,7 +127,8 @@ void drive_hot_add(Monitor *mon, const QDict *qdict) if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) { goto err; } - dev = pci_find_device(pci_find_root_bus(dom), pci_bus, slot, 0); + dev = pci_find_device(pci_find_root_bus(dom), pci_bus, + PCI_DEVFN(slot, 0)); if (!dev) { monitor_printf(mon, "no pci device with address %s\n", pci_addr); goto err; @@ -277,7 +278,7 @@ static int pci_device_hot_remove(Monitor *mon, const char *pci_addr) return -1; } - d = pci_find_device(pci_find_root_bus(dom), bus, slot, 0); + d = pci_find_device(pci_find_root_bus(dom), bus, PCI_DEVFN(slot, 0)); if (!d) { monitor_printf(mon, "slot %d empty\n", slot); return -1; diff --git a/hw/pci.c b/hw/pci.c index 8b76cea914..44a1f9e526 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1603,14 +1603,14 @@ PCIBus *pci_find_bus(PCIBus *bus, int bus_num) return NULL; } -PCIDevice *pci_find_device(PCIBus *bus, int bus_num, int slot, int function) +PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn) { bus = pci_find_bus(bus, bus_num); if (!bus) return NULL; - return bus->devices[PCI_DEVFN(slot, function)]; + return bus->devices[devfn]; } static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) diff --git a/hw/pci.h b/hw/pci.h index 7d56337c2b..14aba97de1 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -252,7 +252,7 @@ void pci_for_each_device(PCIBus *bus, int bus_num, void (*fn)(PCIBus *bus, PCIDe PCIBus *pci_find_root_bus(int domain); int pci_find_domain(const PCIBus *bus); PCIBus *pci_find_bus(PCIBus *bus, int bus_num); -PCIDevice *pci_find_device(PCIBus *bus, int bus_num, int slot, int function); +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); diff --git a/hw/pci_host.c b/hw/pci_host.c index 7c40155b95..728e2d4ce5 100644 --- a/hw/pci_host.c +++ b/hw/pci_host.c @@ -44,7 +44,7 @@ static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr) uint8_t bus_num = addr >> 16; uint8_t devfn = addr >> 8; - return pci_find_device(bus, bus_num, PCI_SLOT(devfn), PCI_FUNC(devfn)); + return pci_find_device(bus, bus_num, devfn); } void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len) diff --git a/hw/pcie_host.c b/hw/pcie_host.c index 21069eed83..b7498656f2 100644 --- a/hw/pcie_host.c +++ b/hw/pcie_host.c @@ -49,8 +49,7 @@ static inline PCIDevice *pcie_dev_find_by_mmcfg_addr(PCIBus *s, uint32_t mmcfg_addr) { return pci_find_device(s, PCIE_MMCFG_BUS(mmcfg_addr), - PCI_SLOT(PCIE_MMCFG_DEVFN(mmcfg_addr)), - PCI_FUNC(PCIE_MMCFG_DEVFN(mmcfg_addr))); + PCIE_MMCFG_DEVFN(mmcfg_addr)); } static void pcie_mmcfg_data_write(PCIBus *s, |