| Message ID | 20240923093016.66437-14-shentey@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | E500 Cleanup | expand |
On 9/23/24 11:30, Bernhard Beschow wrote: > Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/pci-host/ppce500.c | 42 ++++++++++++++++++------------------------ > 1 file changed, 18 insertions(+), 24 deletions(-) > > diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c > index d7ff2ba778..1ce79ea20c 100644 > --- a/hw/pci-host/ppce500.c > +++ b/hw/pci-host/ppce500.c > @@ -21,7 +21,6 @@ > #include "hw/pci/pci_device.h" > #include "hw/pci/pci_host.h" > #include "qemu/bswap.h" > -#include "qemu/module.h" > #include "hw/pci-host/ppce500.h" > #include "qom/object.h" > > @@ -508,17 +507,6 @@ static void e500_host_bridge_class_init(ObjectClass *klass, void *data) > dc->user_creatable = false; > } > > -static const TypeInfo e500_host_bridge_info = { > - .name = TYPE_PPC_E500_PCI_BRIDGE, > - .parent = TYPE_PCI_DEVICE, > - .instance_size = sizeof(PPCE500PCIBridgeState), > - .class_init = e500_host_bridge_class_init, > - .interfaces = (InterfaceInfo[]) { > - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > - { }, > - }, > -}; > - > static Property pcihost_properties[] = { > DEFINE_PROP_UINT32("first_slot", PPCE500PCIState, first_slot, 0x11), > DEFINE_PROP_UINT32("first_pin_irq", PPCE500PCIState, first_pin_irq, 0x1), > @@ -535,17 +523,23 @@ static void e500_pcihost_class_init(ObjectClass *klass, void *data) > dc->vmsd = &vmstate_ppce500_pci; > } > > -static const TypeInfo e500_pcihost_info = { > - .name = TYPE_PPC_E500_PCI_HOST_BRIDGE, > - .parent = TYPE_PCI_HOST_BRIDGE, > - .instance_size = sizeof(PPCE500PCIState), > - .class_init = e500_pcihost_class_init, > +static const TypeInfo types[] = { > + { > + .name = TYPE_PPC_E500_PCI_BRIDGE, > + .parent = TYPE_PCI_DEVICE, > + .instance_size = sizeof(PPCE500PCIBridgeState), > + .class_init = e500_host_bridge_class_init, > + .interfaces = (InterfaceInfo[]) { > + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > + { }, > + }, > + }, > + { > + .name = TYPE_PPC_E500_PCI_HOST_BRIDGE, > + .parent = TYPE_PCI_HOST_BRIDGE, > + .instance_size = sizeof(PPCE500PCIState), > + .class_init = e500_pcihost_class_init, > + }, > }; > > -static void e500_pci_register_types(void) > -{ > - type_register_static(&e500_pcihost_info); > - type_register_static(&e500_host_bridge_info); > -} > - > -type_init(e500_pci_register_types) > +DEFINE_TYPES(types)
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index d7ff2ba778..1ce79ea20c 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -21,7 +21,6 @@ #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" #include "qemu/bswap.h" -#include "qemu/module.h" #include "hw/pci-host/ppce500.h" #include "qom/object.h" @@ -508,17 +507,6 @@ static void e500_host_bridge_class_init(ObjectClass *klass, void *data) dc->user_creatable = false; } -static const TypeInfo e500_host_bridge_info = { - .name = TYPE_PPC_E500_PCI_BRIDGE, - .parent = TYPE_PCI_DEVICE, - .instance_size = sizeof(PPCE500PCIBridgeState), - .class_init = e500_host_bridge_class_init, - .interfaces = (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - static Property pcihost_properties[] = { DEFINE_PROP_UINT32("first_slot", PPCE500PCIState, first_slot, 0x11), DEFINE_PROP_UINT32("first_pin_irq", PPCE500PCIState, first_pin_irq, 0x1), @@ -535,17 +523,23 @@ static void e500_pcihost_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_ppce500_pci; } -static const TypeInfo e500_pcihost_info = { - .name = TYPE_PPC_E500_PCI_HOST_BRIDGE, - .parent = TYPE_PCI_HOST_BRIDGE, - .instance_size = sizeof(PPCE500PCIState), - .class_init = e500_pcihost_class_init, +static const TypeInfo types[] = { + { + .name = TYPE_PPC_E500_PCI_BRIDGE, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PPCE500PCIBridgeState), + .class_init = e500_host_bridge_class_init, + .interfaces = (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, + }, + { + .name = TYPE_PPC_E500_PCI_HOST_BRIDGE, + .parent = TYPE_PCI_HOST_BRIDGE, + .instance_size = sizeof(PPCE500PCIState), + .class_init = e500_pcihost_class_init, + }, }; -static void e500_pci_register_types(void) -{ - type_register_static(&e500_pcihost_info); - type_register_static(&e500_host_bridge_info); -} - -type_init(e500_pci_register_types) +DEFINE_TYPES(types)
Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/pci-host/ppce500.c | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-)