mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci: remove pci_sub_bus() by open coding.

Browse Source 
Because pci_sub_bus() is used only once so eliminate it
by open coding as suggested by "Michael S. Tsirkin" <mst@redhat.com>.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Isaku Yamahata 2009-11-12 14:58:35 +09:00 committed by Michael S. Tsirkin
parent f08b32fe95
commit 070297d260
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/pci.c
View File

@ -239,13 +239,6 @@ int pci_bus_num(PCIBus *s)
return s->parent_dev->config[PCI_SECONDARY_BUS];
}
static uint8_t pci_sub_bus(PCIBus *s)
{
if (!s->parent_dev)
return 255; /* pci host bridge */
return s->parent_dev->config[PCI_SUBORDINATE_BUS];
}
static int get_pci_config_device(QEMUFile *f, void *pv, size_t size)
{
PCIDevice *s = container_of(pv, PCIDevice, config);
@ -1180,7 +1173,10 @@ PCIBus *pci_find_bus(PCIBus *bus, int bus_num)
/* try child bus */
QLIST_FOREACH(sec, &bus->child, sibling) {
if (pci_bus_num(sec) <= bus_num && bus_num <= pci_sub_bus(sec)) {
if (!bus->parent_dev /* pci host bridge */
|| (pci_bus_num(sec) <= bus_num &&
bus->parent_dev->config[PCI_SUBORDINATE_BUS])) {
return pci_find_bus(sec, bus_num);
}
}