Commit 148dec4486 for qemu.org

commit 148dec44869e5b18a122f13e6f0bb2a4833d34ed
Author: Alistair Francis <alistair.francis@wdc.com>
Date:   Thu Mar 12 14:31:57 2026 +1000

    hw/arm: fsl-imx6: Don't call qdev_get_machine in soc init

    Calling qdev_get_machine() in the soc_init function would result in
    the following assert

        ../hw/core/qdev.c:858: qdev_get_machine: Assertion `dev' failed.

    when trying to run

        ./qemu-system-aarch64 -S -display none -M virt -device fsl-imx6,help

    as the machine wasn't created yet. We call qdev_get_machine() to obtain
    the number of CPUs in the machine. So instead of initialising the CPUs in
    the SoC init let's instead do it in the realise where the machine
    will exist.

    Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
    Tested-by: Markus Armbruster <armbru@redhat.com>
    Message-ID: <20260312043158.4191378-7-alistair.francis@wdc.com>
    Signed-off-by: Thomas Huth <thuth@redhat.com>

diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index 39667c4a49..f663ddbf0a 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -38,17 +38,10 @@

 static void fsl_imx6_init(Object *obj)
 {
-    MachineState *ms = MACHINE(qdev_get_machine());
     FslIMX6State *s = FSL_IMX6(obj);
     char name[NAME_SIZE];
     int i;

-    for (i = 0; i < MIN(ms->smp.cpus, FSL_IMX6_NUM_CPUS); i++) {
-        snprintf(name, NAME_SIZE, "cpu%d", i);
-        object_initialize_child(obj, name, &s->cpu[i],
-                                ARM_CPU_TYPE_NAME("cortex-a9"));
-    }
-
     object_initialize_child(obj, "a9mpcore", &s->a9mpcore, TYPE_A9MPCORE_PRIV);

     object_initialize_child(obj, "ccm", &s->ccm, TYPE_IMX6_CCM);
@@ -119,6 +112,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
     unsigned int smp_cpus = ms->smp.cpus;
     DeviceState *mpcore = DEVICE(&s->a9mpcore);
     DeviceState *gic;
+    char name[NAME_SIZE];

     if (smp_cpus > FSL_IMX6_NUM_CPUS) {
         error_setg(errp, "%s: Only %d CPUs are supported (%d requested)",
@@ -126,6 +120,12 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
         return;
     }

+    for (i = 0; i < smp_cpus; i++) {
+        snprintf(name, NAME_SIZE, "cpu%d", i);
+        object_initialize_child(OBJECT(dev), name, &s->cpu[i],
+                                ARM_CPU_TYPE_NAME("cortex-a9"));
+    }
+
     for (i = 0; i < smp_cpus; i++) {

         /* On uniprocessor, the CBAR is set to 0 */