If "smp_cpus> FSL_IMX6_NUM_CPUS" fails in *_realize(), there is no need to initialize the CPUs in *_init(). So it could be better to create all cpus after the validity in *_realize(). On the other hand, it makes the usages of global variable smp_cpus more centrally for maintenance.
Suggested-by: Igor Mammedov <imamm...@redhat.com> Signed-off-by: Like Xu <like...@linux.intel.com> --- hw/arm/fsl-imx6.c | 13 +++++++------ hw/arm/fsl-imx6ul.c | 12 ++++++------ hw/arm/fsl-imx7.c | 15 +++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 7b7b97f..14015a1 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -37,12 +37,6 @@ static void fsl_imx6_init(Object *obj) char name[NAME_SIZE]; int i; - for (i = 0; i < MIN(smp_cpus, FSL_IMX6_NUM_CPUS); i++) { - snprintf(name, NAME_SIZE, "cpu%d", i); - object_initialize_child(obj, name, &s->cpu[i], sizeof(s->cpu[i]), - "cortex-a9-" TYPE_ARM_CPU, &error_abort, NULL); - } - sysbus_init_child_obj(obj, "a9mpcore", &s->a9mpcore, sizeof(s->a9mpcore), TYPE_A9MPCORE_PRIV); @@ -95,6 +89,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) { FslIMX6State *s = FSL_IMX6(dev); uint16_t i; + char name[NAME_SIZE]; Error *err = NULL; if (smp_cpus > FSL_IMX6_NUM_CPUS) { @@ -103,6 +98,12 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) return; } + for (i = 0; i < MIN(smp_cpus, FSL_IMX6_NUM_CPUS); i++) { + snprintf(name, NAME_SIZE, "cpu%d", i); + object_initialize_child(OBJECT(dev), name, &s->cpu[i], + sizeof(s->cpu[i]), "cortex-a9-" TYPE_ARM_CPU, &error_abort, NULL); + } + for (i = 0; i < smp_cpus; i++) { /* On uniprocessor, the CBAR is set to 0 */ diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index 4b56bfa..7f30eb7 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -32,12 +32,6 @@ static void fsl_imx6ul_init(Object *obj) char name[NAME_SIZE]; int i; - for (i = 0; i < MIN(smp_cpus, FSL_IMX6UL_NUM_CPUS); i++) { - snprintf(name, NAME_SIZE, "cpu%d", i); - object_initialize_child(obj, name, &s->cpu[i], sizeof(s->cpu[i]), - "cortex-a7-" TYPE_ARM_CPU, &error_abort, NULL); - } - /* * A7MPCORE */ @@ -167,6 +161,12 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp) return; } + for (i = 0; i < MIN(smp_cpus, FSL_IMX6UL_NUM_CPUS); i++) { + snprintf(name, NAME_SIZE, "cpu%d", i); + object_initialize_child(OBJECT(dev), name, &s->cpu[i], + sizeof(s->cpu[i]), "cortex-a7-" TYPE_ARM_CPU, &error_abort, NULL); + } + for (i = 0; i < smp_cpus; i++) { Object *o = OBJECT(&s->cpu[i]); diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c index 7663ad6..2580348 100644 --- a/hw/arm/fsl-imx7.c +++ b/hw/arm/fsl-imx7.c @@ -34,14 +34,6 @@ static void fsl_imx7_init(Object *obj) char name[NAME_SIZE]; int i; - - for (i = 0; i < MIN(smp_cpus, FSL_IMX7_NUM_CPUS); i++) { - snprintf(name, NAME_SIZE, "cpu%d", i); - object_initialize_child(obj, name, &s->cpu[i], sizeof(s->cpu[i]), - ARM_CPU_TYPE_NAME("cortex-a7"), &error_abort, - NULL); - } - /* * A7MPCORE */ @@ -167,6 +159,13 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) return; } + for (i = 0; i < MIN(smp_cpus, FSL_IMX7_NUM_CPUS); i++) { + snprintf(name, NAME_SIZE, "cpu%d", i); + object_initialize_child(OBJECT(dev), name, &s->cpu[i], + sizeof(s->cpu[i]), ARM_CPU_TYPE_NAME("cortex-a7"), + &error_abort, NULL); + } + for (i = 0; i < smp_cpus; i++) { o = OBJECT(&s->cpu[i]); -- 1.8.3.1