@samitouri / QOSamiQemu / commits / 6ddec45a14

hw/arm/imx8mp-evk: Open code DEFINE_MACHINE_AARCH64

Open code the DEFINE_MACHINE_AARCH64 macro in preparation of creating FslImx8mpEvkState class, needed for FlexCAN emulation. Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Acked-by: Pavel Pisa <pisa@fel.cvut.cz> Tested-by: Pavel Pisa <pisa@fel.cvut.cz> Message-ID: <20260702184038.178196-4-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

Bernhard Beschow committed Jul 2, 2026 at 20:40 UTC 6ddec45a14c1d033b236a656c5ae0d02ae6a675c
1 file changed +13 -2
hw/arm/imx8mp-evk.c
+13 -2
@@ -113,8 +113,10 @@ static const char *imx8mp_evk_get_default_cpu_type(const MachineState *ms)
113 return ARM_CPU_TYPE_NAME("cortex-a53");
114 }
115
116 -static void imx8mp_evk_machine_init(MachineClass *mc)
116 +static void imx8mp_evk_machine_class_init(ObjectClass *oc, const void *data)
117 {
118 + MachineClass *mc = MACHINE_CLASS(oc);
119 +
120 mc->desc = "NXP i.MX 8M Plus EVK Board";
121 mc->init = imx8mp_evk_init;
122 mc->default_cpus = 4;
@@ -124,4 +126,13 @@ static void imx8mp_evk_machine_init(MachineClass *mc)
126 mc->get_default_cpu_type = imx8mp_evk_get_default_cpu_type;
127 }
128
127 -DEFINE_MACHINE_AARCH64("imx8mp-evk", imx8mp_evk_machine_init)
129 +static const TypeInfo imx8mp_evk_machine_types[] = {
130 + {
131 + .name = MACHINE_TYPE_NAME("imx8mp-evk"),
132 + .parent = TYPE_MACHINE,
133 + .class_init = imx8mp_evk_machine_class_init,
134 + .interfaces = aarch64_machine_interfaces,
135 + },
136 +};
137 +
138 +DEFINE_TYPES(imx8mp_evk_machine_types)