david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pci: fix pci_find_bus().

Browse Source 
When looking down child bus, it should look parent bridge's
bus number, not child bus's.
Optimized tail recursion and style fix.

Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Isaku Yamahata 2010-04-12 11:58:59 +09:00 committed by Blue Swirl
parent ab07b980c4
commit 470e63633f
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/pci.c
View File

@ -1546,23 +1546,30 @@ static void pci_bridge_write_config(PCIDevice *d,
PCIBus *pci_find_bus(PCIBus *bus, int bus_num) PCIBus *pci_find_bus(PCIBus *bus, int bus_num)
{ {
PCIBus *sec, *ret; PCIBus *sec;
if (!bus) if (!bus) {
return NULL; return NULL;
}
if (pci_bus_num(bus) == bus_num) { if (pci_bus_num(bus) == bus_num) {
return bus; return bus;
} }
/* try child bus */ /* try child bus */
QLIST_FOREACH(sec, &bus->child, sibling) { if (!bus->parent_dev /* host pci bridge */ ||
if (!bus->parent_dev /* pci host bridge */ (bus->parent_dev->config[PCI_SECONDARY_BUS] < bus_num &&
|| (pci_bus_num(sec) <= bus_num && bus_num <= bus->parent_dev->config[PCI_SUBORDINATE_BUS])) {
bus_num <= bus->parent_dev->config[PCI_SUBORDINATE_BUS]) ) { for (; bus; bus = sec) {
ret = pci_find_bus(sec, bus_num); QLIST_FOREACH(sec, &bus->child, sibling) {
if (ret) { assert(sec->parent_dev);
return ret; if (sec->parent_dev->config[PCI_SECONDARY_BUS] == bus_num) {
return sec;
}
if (sec->parent_dev->config[PCI_SECONDARY_BUS] < bus_num &&
bus_num <= sec->parent_dev->config[PCI_SUBORDINATE_BUS]) {
break;
}
} }
} }
} }