[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/5] pci: use devfn for pci_find_device() instead
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH v2 2/5] pci: use devfn for pci_find_device() instead of (slot, fn) pair |
Date: |
Thu, 27 Jan 2011 15:56:36 +0900 |
(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 <address@hidden>
---
hw/pci-hotplug.c | 5 +++--
hw/pci.c | 4 ++--
hw/pci.h | 2 +-
hw/pci_host.c | 2 +-
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 270a982..9715235 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -126,7 +126,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;
@@ -276,7 +277,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 9085680..899b23d 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1602,14 +1602,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 aa5f912..72025b1 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 7c40155..728e2d4 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 21069ee..b749865 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,
--
1.7.1.1
- [Qemu-devel] [PATCH v2 0/5] pci/pcie: implement ARI enable bit correctly, Isaku Yamahata, 2011/01/27
- [Qemu-devel] [PATCH v2 3/5] pci/pcie: make pci_find_device() ARI aware., Isaku Yamahata, 2011/01/27
- [Qemu-devel] [PATCH v2 4/5] pci: use PCI_SLOT in pci_get_bus_devfn(), Isaku Yamahata, 2011/01/27
- [Qemu-devel] [PATCH v2 5/5] pci: use uint8_t for devfn_min, Isaku Yamahata, 2011/01/27
- [Qemu-devel] [PATCH v2 1/5] pci: replace the magic, 256, for the maximum of devfn, Isaku Yamahata, 2011/01/27
- [Qemu-devel] [PATCH v2 2/5] pci: use devfn for pci_find_device() instead of (slot, fn) pair,
Isaku Yamahata <=
- [Qemu-devel] Re: [PATCH v2 0/5] pci/pcie: implement ARI enable bit correctly, Michael S. Tsirkin, 2011/01/27