pci: fix pci_find_bus().
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:
parent
ab07b980c4
commit
470e63633f
23
hw/pci.c
23
hw/pci.c
|
@ -1546,23 +1546,30 @@ static void pci_bridge_write_config(PCIDevice *d,
|
|||
|
||||
PCIBus *pci_find_bus(PCIBus *bus, int bus_num)
|
||||
{
|
||||
PCIBus *sec, *ret;
|
||||
PCIBus *sec;
|
||||
|
||||
if (!bus)
|
||||
if (!bus) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (pci_bus_num(bus) == bus_num) {
|
||||
return bus;
|
||||
}
|
||||
|
||||
/* try child bus */
|
||||
QLIST_FOREACH(sec, &bus->child, sibling) {
|
||||
if (!bus->parent_dev /* pci host bridge */
|
||||
|| (pci_bus_num(sec) <= bus_num &&
|
||||
if (!bus->parent_dev /* host pci bridge */ ||
|
||||
(bus->parent_dev->config[PCI_SECONDARY_BUS] < bus_num &&
|
||||
bus_num <= bus->parent_dev->config[PCI_SUBORDINATE_BUS])) {
|
||||
ret = pci_find_bus(sec, bus_num);
|
||||
if (ret) {
|
||||
return ret;
|
||||
for (; bus; bus = sec) {
|
||||
QLIST_FOREACH(sec, &bus->child, sibling) {
|
||||
assert(sec->parent_dev);
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue