Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LW2Se-0002L1-Ie for qemu-devel@nongnu.org; Sun, 08 Feb 2009 00:44:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LW2Sc-0002K7-SP for qemu-devel@nongnu.org; Sun, 08 Feb 2009 00:44:07 -0500 Received: from [199.232.76.173] (port=51390 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LW2Sc-0002Jz-9e for qemu-devel@nongnu.org; Sun, 08 Feb 2009 00:44:06 -0500 Received: from mx2.redhat.com ([66.187.237.31]:54267) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LW2Sb-0006kl-Lj for qemu-devel@nongnu.org; Sun, 08 Feb 2009 00:44:06 -0500 Date: Fri, 6 Feb 2009 15:35:24 -0200 From: Marcelo Tosatti Subject: Re: [Qemu-devel] [patch 01/18] qemu: add pci helper functions Message-ID: <20090206173524.GB22784@amt.cnet> References: <20090204133303.113145633@localhost.localdomain> <20090204133923.175155873@localhost.localdomain> <200902041456.20944.paul@codesourcery.com> <4989E947.9020201@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4989E947.9020201@codemonkey.ws> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org On Wed, Feb 04, 2009 at 01:15:19PM -0600, Anthony Liguori wrote: >> This loop is bogus. You already know the devfn from the slot. >> It's also completely busted if you have multifunction devices. >> > It should probably try a bit harder to handle the multifunction case. > You know your device is bus->devices[slot * 8] but you should also check > slot * 8 + 1..slot * 8 + 7 to see if there are any sub functions and > return NULL or something. qemu: add pci helper functions Add pci_find_bus/pci_find_device to be used by PCI hotplug. Signed-off-by: Marcelo Tosatti Index: trunk/hw/pci.c =================================================================== --- trunk.orig/hw/pci.c +++ trunk/hw/pci.c @@ -713,6 +713,26 @@ static void pci_bridge_write_config(PCID pci_default_write_config(d, address, val, len); } +PCIBus *pci_find_bus(int bus_num) +{ + PCIBus *bus = first_bus; + + while (bus && bus->bus_num != bus_num) + bus = bus->next; + + return bus; +} + +PCIDevice *pci_find_device(int bus_num, int slot, int function) +{ + PCIBus *bus = pci_find_bus(bus_num); + + if (!bus) + return NULL; + + return bus->devices[PCI_DEVFN(slot, function)]; +} + PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, pci_map_irq_fn map_irq, const char *name) { Index: trunk/hw/pci.h =================================================================== --- trunk.orig/hw/pci.h +++ trunk/hw/pci.h @@ -8,6 +8,10 @@ extern target_phys_addr_t pci_mem_base; +#define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) +#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) +#define PCI_FUNC(devfn) ((devfn) & 0x07) + /* Device classes and subclasses */ #define PCI_CLASS_STORAGE_SCSI 0x0100 @@ -222,6 +226,8 @@ void pci_data_write(void *opaque, uint32 uint32_t pci_data_read(void *opaque, uint32_t addr, int len); int pci_bus_num(PCIBus *s); void pci_for_each_device(int bus_num, void (*fn)(PCIDevice *d)); +PCIBus *pci_find_bus(int bus_num); +PCIDevice *pci_find_device(int bus_num, int slot, int function); void pci_info(void); PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did,