ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pci: Create and use API to determine root buses 

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Alex Williamson 2013-03-14 16:01:29 -06:00 committed by Michael S. Tsirkin
parent 8c0bf9e242
commit 0889464a50
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/pci/pci.c
View File

@ -302,6 +302,11 @@ bool pci_bus_is_express(PCIBus *bus)
return object_dynamic_cast(OBJECT(bus), TYPE_PCIE_BUS); return object_dynamic_cast(OBJECT(bus), TYPE_PCIE_BUS);
} }
bool pci_bus_is_root(PCIBus *bus)
{
return !bus->parent_dev;
}
void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
const char *name, const char *name,
MemoryRegion *address_space_mem, MemoryRegion *address_space_mem,
@ -360,7 +365,7 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name,
int pci_bus_num(PCIBus *s) int pci_bus_num(PCIBus *s)
{ {
if (!s->parent_dev) if (pci_bus_is_root(s))
return 0; /* pci host bridge */ return 0; /* pci host bridge */
return s->parent_dev->config[PCI_SECONDARY_BUS]; return s->parent_dev->config[PCI_SECONDARY_BUS];
} }
@ -1186,7 +1191,7 @@ static void pci_set_irq(void *opaque, int irq_num, int level)
/* Special hooks used by device assignment */ /* Special hooks used by device assignment */
void pci_bus_set_route_irq_fn(PCIBus *bus, pci_route_irq_fn route_intx_to_irq) void pci_bus_set_route_irq_fn(PCIBus *bus, pci_route_irq_fn route_intx_to_irq)
{ {
assert(!bus->parent_dev); assert(pci_bus_is_root(bus));
bus->route_intx_to_irq = route_intx_to_irq; bus->route_intx_to_irq = route_intx_to_irq;
} }
@ -1651,7 +1656,7 @@ static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num)
} }
/* Consider all bus numbers in range for the host pci bridge. */ /* Consider all bus numbers in range for the host pci bridge. */
if (bus->parent_dev && if (!pci_bus_is_root(bus) &&
!pci_secondary_bus_in_range(bus->parent_dev, bus_num)) { !pci_secondary_bus_in_range(bus->parent_dev, bus_num)) {
return NULL; return NULL;
} }
@ -1659,7 +1664,7 @@ static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num)
/* try child bus */ /* try child bus */
for (; bus; bus = sec) { for (; bus; bus = sec) {
QLIST_FOREACH(sec, &bus->child, sibling) { QLIST_FOREACH(sec, &bus->child, sibling) {
assert(sec->parent_dev); assert(!pci_bus_is_root(sec));
if (sec->parent_dev->config[PCI_SECONDARY_BUS] == bus_num) { if (sec->parent_dev->config[PCI_SECONDARY_BUS] == bus_num) {
return sec; return sec;
} }

1
hw/pci/pci.h
View File

@ -345,6 +345,7 @@ typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev,
#define TYPE_PCIE_BUS "PCIE" #define TYPE_PCIE_BUS "PCIE"
bool pci_bus_is_express(PCIBus *bus); bool pci_bus_is_express(PCIBus *bus);
bool pci_bus_is_root(PCIBus *bus);
void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
const char *name, const char *name,
MemoryRegion *address_space_mem, MemoryRegion *address_space_mem,