Replace the ARMCPU field in FslIMX25State by a reference to
an allocated ARMCPU. Instead of initializing the field with
object_initialize(), allocate it with object_new().
As we don't access ARMCPU internal fields or size, we can
move from arm_ss[] to the more generic softmmu_ss[] the followin
units:
- fsl-imx31.c
- kzm.c
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
hw/arm/fsl-imx31.c | 9 +++++----
hw/arm/kzm.c | 2 +-
hw/arm/meson.build | 2 +-
include/hw/arm/fsl-imx31.h | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index def27bb913..26c6bb67f0 100644
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -32,7 +32,8 @@ static void fsl_imx31_init(Object *obj)
FslIMX31State *s = FSL_IMX31(obj);
int i;
- object_initialize_child(obj, "cpu", &s->cpu, ARM_CPU_TYPE_NAME("arm1136"));
+ s->cpu = ARM_CPU(object_new(ARM_CPU_TYPE_NAME("arm1136")));
+ object_property_add_child(obj, "cpu", OBJECT(s->cpu));
object_initialize_child(obj, "avic", &s->avic, TYPE_IMX_AVIC);
@@ -65,7 +66,7 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)
uint16_t i;
Error *err = NULL;
- if (!qdev_realize(DEVICE(&s->cpu), NULL, errp)) {
+ if (!qdev_realize(DEVICE(s->cpu), NULL, errp)) {
return;
}
@@ -74,9 +75,9 @@ static void fsl_imx31_realize(DeviceState *dev, Error **errp)
}
sysbus_mmio_map(SYS_BUS_DEVICE(&s->avic), 0, FSL_IMX31_AVIC_ADDR);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 0,
- qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
+ qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_IRQ));
sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 1,
- qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
+ qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_FIQ));
if (!sysbus_realize(SYS_BUS_DEVICE(&s->ccm), errp)) {
return;
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index b1b281c9ac..8c6cdb06f5 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -126,7 +126,7 @@ static void kzm_init(MachineState *machine)
kzm_binfo.ram_size = machine->ram_size;
if (!qtest_enabled()) {
- arm_load_kernel(&s->soc.cpu, machine, &kzm_binfo);
+ arm_load_kernel(s->soc.cpu, machine, &kzm_binfo);
}
}
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index ccda1f5149..b244db5962 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -20,7 +20,6 @@ arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true:
files('allwinner-h3.c', 'orange
arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c'))
arm_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c',
'xlnx-zcu102.c'))
arm_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c',
'xlnx-versal-virt.c'))
-arm_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c'))
arm_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c'))
arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
'aspeed_soc.c',
@@ -41,6 +40,7 @@ softmmu_ss.add(when: 'CONFIG_DIGIC', if_true:
files('digic_boards.c'))
softmmu_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c'))
softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
softmmu_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c',
'imx25_pdk.c'))
+softmmu_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c',
'kzm.c'))
softmmu_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c'))
softmmu_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c'))
softmmu_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c'))
diff --git a/include/hw/arm/fsl-imx31.h b/include/hw/arm/fsl-imx31.h
index c116a73e0b..c117136901 100644
--- a/include/hw/arm/fsl-imx31.h
+++ b/include/hw/arm/fsl-imx31.h
@@ -27,7 +27,7 @@
#include "hw/gpio/imx_gpio.h"
#include "hw/watchdog/wdt_imx2.h"
#include "exec/memory.h"
-#include "target/arm/cpu.h"
+#include "hw/arm/cpu.h"
#include "qom/object.h"
#define TYPE_FSL_IMX31 "fsl-imx31"
@@ -43,7 +43,7 @@ struct FslIMX31State {
DeviceState parent_obj;
/*< public >*/
- ARMCPU cpu;
+ ARMCPU *cpu;
IMXAVICState avic;
IMX31CCMState ccm;
IMXSerialState uart[FSL_IMX31_NUM_UARTS];
--
2.38.1
