From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34257 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi5aW-0007pZ-1b for qemu-devel@nongnu.org; Wed, 26 Jan 2011 08:39:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi5aU-0008OT-1v for qemu-devel@nongnu.org; Wed, 26 Jan 2011 08:39:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi5aT-0008O2-RG for qemu-devel@nongnu.org; Wed, 26 Jan 2011 08:39:06 -0500 Date: Wed, 26 Jan 2011 15:38:48 +0200 From: "Michael S. Tsirkin" Message-ID: <20110126133848.GC12805@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] Re: [PATCH 2/3] pci: use devfn for pci_find_device() instead of (slot, fn) pair List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org On Wed, Jan 26, 2011 at 06:45:19PM +0900, Isaku Yamahata wrote: > (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 I'd prefer using uint8_t for devfn. This way we don't need to bother to range-check it either. > --- > hw/pci-hotplug.c | 5 +++-- > hw/pci.c | 5 +++-- > hw/pci.h | 2 +- > hw/pci_host.c | 2 +- > hw/pcie_host.c | 3 +-- > 5 files changed, 9 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 79a46e7..ac16029 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -1599,14 +1599,15 @@ 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, int devfn) > { > + assert(devfn < PCI_DEVFN_MAX); > 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 ffb04e8..f6d20f6 100644 > --- a/hw/pci.h > +++ b/hw/pci.h > @@ -253,7 +253,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, int 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