Commit b0e5196a authored by David Gibson's avatar David Gibson Committed by Michael S. Tsirkin
Browse files

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: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <20190424041959.4087-3-david@gibson.dropbear.id.au>
parent c76efd72

hw/pci-bridge/pci_expander_bridge.c

+0 −6
Original line number Diff line number Diff line
@@ -66,11 +66,6 @@ static int pxb_bus_num(PCIBus *bus) 
    return pxb->bus_nr;

}



static bool pxb_is_root(PCIBus *bus)

{

    return true; /* by definition */

}



static uint16_t pxb_bus_numa_node(PCIBus *bus)

{

    PXBDev *pxb = convert_to_pxb(bus->parent_dev);
@@ -83,7 +78,6 @@ static void pxb_bus_class_init(ObjectClass *class, void *data) 
    PCIBusClass *pbc = PCI_BUS_CLASS(class);



    pbc->bus_num = pxb_bus_num;

    pbc->is_root = pxb_is_root;

    pbc->numa_node = pxb_bus_numa_node;

}

hw/pci/pci.c

+2 −12
Original line number Diff line number Diff line
@@ -129,14 +129,9 @@ static void pci_bus_unrealize(BusState *qbus, Error **errp) 
    vmstate_unregister(NULL, &vmstate_pcibus, bus);

}



static bool pcibus_is_root(PCIBus *bus)

{

    return !bus->parent_dev;

}



static int pcibus_num(PCIBus *bus)

{

    if (pcibus_is_root(bus)) {

    if (pci_bus_is_root(bus)) {

        return 0; /* pci host bridge */

    }

    return bus->parent_dev->config[PCI_SECONDARY_BUS];
@@ -164,7 +159,6 @@ static void pci_bus_class_init(ObjectClass *klass, void *data) 
    k->unrealize = pci_bus_unrealize;

    k->reset = pcibus_reset;



    pbc->is_root = pcibus_is_root;

    pbc->bus_num = pcibus_num;

    pbc->numa_node = pcibus_numa_node;

    pbc->allows_extended_config_space = pcibus_allows_extended_config_space;
@@ -398,6 +392,7 @@ static void pci_root_bus_init(PCIBus *bus, DeviceState *parent, 
    bus->slot_reserved_mask = 0x0;

    bus->address_space_mem = address_space_mem;

    bus->address_space_io = address_space_io;

    bus->flags |= PCI_BUS_IS_ROOT;



    /* host bridge */

    QLIST_INIT(&bus->child);
@@ -415,11 +410,6 @@ bool pci_bus_is_express(PCIBus *bus) 
    return object_dynamic_cast(OBJECT(bus), TYPE_PCIE_BUS);

}



bool pci_bus_is_root(PCIBus *bus)

{

    return PCI_BUS_GET_CLASS(bus)->is_root(bus);

}



bool pci_bus_allows_extended_config_space(PCIBus *bus)

{

    return PCI_BUS_GET_CLASS(bus)->allows_extended_config_space(bus);

hw/virtio/virtio-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "standard-headers/linux/virtio_pci.h"

#include "hw/virtio/virtio.h"

#include "hw/pci/pci.h"

#include "hw/pci/pci_bus.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "hw/pci/msi.h"

include/hw/pci/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

include/hw/pci/pci_bus.h

+11 −1
Original line number Diff line number Diff line
@@ -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 */