mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 08:43:55 -06:00
pci: Simplify pci_bus_is_root()
pci_bus_is_root() currently relies on a method in the PCIBusClass. But it's always known if a PCI bus is a root bus when we create it, so using a dynamic method is overkill. This replaces it with an IS_ROOT bit in a new flags field, which is set on root buses and otherwise clear. As a bonus this removes the special is_root logic from pci_expander_bridge, since it already creates its bus as a root bus. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Greg Kurz <groug@kaod.org> Message-Id: <20190424041959.4087-3-david@gibson.dropbear.id.au>
This commit is contained in:
parent
c76efd7225
commit
b0e5196a52
5 changed files with 14 additions and 20 deletions
|
@ -395,7 +395,6 @@ typedef PCIINTxRoute (*pci_route_irq_fn)(void *opaque, int pin);
|
|||
#define TYPE_PCIE_BUS "PCIE"
|
||||
|
||||
bool pci_bus_is_express(PCIBus *bus);
|
||||
bool pci_bus_is_root(PCIBus *bus);
|
||||
bool pci_bus_allows_extended_config_space(PCIBus *bus);
|
||||
|
||||
void pci_root_bus_new_inplace(PCIBus *bus, size_t bus_size, DeviceState *parent,
|
||||
|
|
|
@ -15,14 +15,19 @@ typedef struct PCIBusClass {
|
|||
BusClass parent_class;
|
||||
/*< public >*/
|
||||
|
||||
bool (*is_root)(PCIBus *bus);
|
||||
int (*bus_num)(PCIBus *bus);
|
||||
uint16_t (*numa_node)(PCIBus *bus);
|
||||
bool (*allows_extended_config_space)(PCIBus *bus);
|
||||
} PCIBusClass;
|
||||
|
||||
enum PCIBusFlags {
|
||||
/* This bus is the root of a PCI domain */
|
||||
PCI_BUS_IS_ROOT = 0x0001,
|
||||
};
|
||||
|
||||
struct PCIBus {
|
||||
BusState qbus;
|
||||
enum PCIBusFlags flags;
|
||||
PCIIOMMUFunc iommu_fn;
|
||||
void *iommu_opaque;
|
||||
uint8_t devfn_min;
|
||||
|
@ -47,4 +52,9 @@ struct PCIBus {
|
|||
Notifier machine_done;
|
||||
};
|
||||
|
||||
static inline bool pci_bus_is_root(PCIBus *bus)
|
||||
{
|
||||
return !!(bus->flags & PCI_BUS_IS_ROOT);
|
||||
}
|
||||
|
||||
#endif /* QEMU_PCI_BUS_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue