Introduce type constant. Introduce cast macro to drop bogus busdev field that would've broken SYS_BUS_DEVICE().
Signed-off-by: Andreas Färber <afaer...@suse.de> Reviewed-by: Anthony Liguori <aligu...@us.ibm.com> [AF: Moved type_init function rename here] --- hw/spapr_pci.c | 13 +++++++------ hw/spapr_pci.h | 6 +++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index b901d34..17cdbbd 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -276,7 +276,7 @@ static DMAContext *spapr_pci_dma_context_fn(PCIBus *bus, void *opaque, static int spapr_phb_init(SysBusDevice *s) { - sPAPRPHBState *phb = FROM_SYSBUS(sPAPRPHBState, s); + sPAPRPHBState *phb = SPAPR_PCI_HOST_BRIDGE(s); char *namebuf; int i; PCIBus *bus; @@ -314,7 +314,7 @@ static int spapr_phb_init(SysBusDevice *s) memory_region_add_subregion(get_system_memory(), phb->io_win_addr, &phb->iowindow); - bus = pci_register_bus(&phb->busdev.qdev, + bus = pci_register_bus(DEVICE(s), phb->busname ? phb->busname : phb->dtbusname, pci_spapr_set_irq, pci_spapr_map_irq, phb, &phb->memspace, &phb->iospace, @@ -369,7 +369,7 @@ static void spapr_phb_class_init(ObjectClass *klass, void *data) } static const TypeInfo spapr_phb_info = { - .name = "spapr-pci-host-bridge", + .name = TYPE_SPAPR_PCI_HOST_BRIDGE, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(sPAPRPHBState), .class_init = spapr_phb_class_init, @@ -382,7 +382,7 @@ void spapr_create_phb(sPAPREnvironment *spapr, { DeviceState *dev; - dev = qdev_create(NULL, spapr_phb_info.name); + dev = qdev_create(NULL, TYPE_SPAPR_PCI_HOST_BRIDGE); if (busname) { qdev_prop_set_string(dev, "busname", g_strdup(busname)); @@ -490,8 +490,9 @@ int spapr_populate_pci_devices(sPAPRPHBState *phb, return 0; } -static void register_types(void) +static void spapr_pci_register_types(void) { type_register_static(&spapr_phb_info); } -type_init(register_types) + +type_init(spapr_pci_register_types) diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h index d9e46e2..06e2742 100644 --- a/hw/spapr_pci.h +++ b/hw/spapr_pci.h @@ -27,8 +27,12 @@ #include "hw/pci_host.h" #include "hw/xics.h" +#define TYPE_SPAPR_PCI_HOST_BRIDGE "spapr-pci-host-bridge" + +#define SPAPR_PCI_HOST_BRIDGE(obj) \ + OBJECT_CHECK(sPAPRPHBState, (obj), TYPE_SPAPR_PCI_HOST_BRIDGE) + typedef struct sPAPRPHBState { - SysBusDevice busdev; PCIHostState host_state; uint64_t buid; -- 1.7.7