| Message ID | 20240923093016.66437-16-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/ppc/mpc8544_guts.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c > index 6688fd44c3..cbb1e3adda 100644 > --- a/hw/ppc/mpc8544_guts.c > +++ b/hw/ppc/mpc8544_guts.c > @@ -18,7 +18,6 @@ > */ > > #include "qemu/osdep.h" > -#include "qemu/module.h" > #include "qemu/log.h" > #include "sysemu/runstate.h" > #include "cpu.h" > @@ -141,16 +140,13 @@ static void mpc8544_guts_initfn(Object *obj) > sysbus_init_mmio(d, &s->iomem); > } > > -static const TypeInfo mpc8544_guts_info = { > - .name = TYPE_MPC8544_GUTS, > - .parent = TYPE_SYS_BUS_DEVICE, > - .instance_size = sizeof(GutsState), > - .instance_init = mpc8544_guts_initfn, > +static const TypeInfo types[] = { > + { > + .name = TYPE_MPC8544_GUTS, > + .parent = TYPE_SYS_BUS_DEVICE, > + .instance_size = sizeof(GutsState), > + .instance_init = mpc8544_guts_initfn, > + }, > }; > > -static void mpc8544_guts_register_types(void) > -{ > - type_register_static(&mpc8544_guts_info); > -} > - > -type_init(mpc8544_guts_register_types) > +DEFINE_TYPES(types)
diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index 6688fd44c3..cbb1e3adda 100644 --- a/hw/ppc/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c @@ -18,7 +18,6 @@ */ #include "qemu/osdep.h" -#include "qemu/module.h" #include "qemu/log.h" #include "sysemu/runstate.h" #include "cpu.h" @@ -141,16 +140,13 @@ static void mpc8544_guts_initfn(Object *obj) sysbus_init_mmio(d, &s->iomem); } -static const TypeInfo mpc8544_guts_info = { - .name = TYPE_MPC8544_GUTS, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(GutsState), - .instance_init = mpc8544_guts_initfn, +static const TypeInfo types[] = { + { + .name = TYPE_MPC8544_GUTS, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(GutsState), + .instance_init = mpc8544_guts_initfn, + }, }; -static void mpc8544_guts_register_types(void) -{ - type_register_static(&mpc8544_guts_info); -} - -type_init(mpc8544_guts_register_types) +DEFINE_TYPES(types)
Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/ppc/mpc8544_guts.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)