diff options
author | Isaku Yamahata <yamahata@valinux.co.jp> | 2010-06-23 16:15:26 +0900 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2010-07-11 20:00:53 +0300 |
commit | 6fa84913eccec4266a27c81ae88465f6790742b9 (patch) | |
tree | 3a599d136b179f7ef25b54f18533385601e37c32 /hw | |
parent | 520128bde824d208c0309bcfcdd6ffc4eb450099 (diff) | |
download | hqemu-6fa84913eccec4266a27c81ae88465f6790742b9.zip hqemu-6fa84913eccec4266a27c81ae88465f6790742b9.tar.gz |
pci: insert assert that auto-assigned-address function is single function device.
Auto-assigned-address pci function (passing devfn = -1) is always
single function.
This patch adds assert() to guarantee that auto-assigned-address function
is always single function device at function = 0.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/pci.c | 3 | ||||
-rw-r--r-- | hw/pci.h | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -227,6 +227,7 @@ void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, const char *name, int devfn_min) { qbus_create_inplace(&bus->qbus, &pci_bus_info, parent, name); + assert(PCI_FUNC(devfn_min) == 0); bus->devfn_min = devfn_min; /* host bridge */ @@ -608,7 +609,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, { if (devfn < 0) { for(devfn = bus->devfn_min ; devfn < ARRAY_SIZE(bus->devices); - devfn += 8) { + devfn += PCI_FUNC_MAX) { if (!bus->devices[devfn]) goto found; } @@ -14,6 +14,7 @@ #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) +#define PCI_FUNC_MAX 8 /* Class, Vendor and Device IDs from Linux's pci_ids.h */ #include "pci_ids.h" |