Open code the DEFINE_MACHINE_ARM macro in preparation of creating SabreliteMachineState class.
Signed-off-by: Matyáš Bobek <[email protected]> Signed-off-by: Pavel Pisa <[email protected]> Tested-by: Pavel Pisa <[email protected]> Reviewed-by: Bernhard Beschow <[email protected]> Reviewed-by: Pavel Pisa <[email protected]> --- hw/arm/sabrelite.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index db5669c5c2..04484aaa14 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -104,8 +104,10 @@ static void sabrelite_init(MachineState *machine) } } -static void sabrelite_machine_init(MachineClass *mc) +static void sabrelite_machine_class_init(ObjectClass *oc, const void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + mc->desc = "Freescale i.MX6 Quad SABRE Lite Board (Cortex-A9)"; mc->init = sabrelite_init; mc->max_cpus = FSL_IMX6_NUM_CPUS; @@ -114,4 +116,18 @@ static void sabrelite_machine_init(MachineClass *mc) mc->auto_create_sdcard = true; } -DEFINE_MACHINE_ARM("sabrelite", sabrelite_machine_init) +static const TypeInfo sabrelite_machine_init_typeinfo = { + .name = MACHINE_TYPE_NAME("sabrelite"), + .parent = TYPE_MACHINE, + .class_init = sabrelite_machine_class_init, + .instance_size = sizeof(MachineState), + .abstract = false, + .interfaces = arm_machine_interfaces, +}; + +static void sabrelite_machine_init_register_types(void) +{ + type_register_static(&sabrelite_machine_init_typeinfo); +} + +type_init(sabrelite_machine_init_register_types) -- 2.54.0
