Commit 7b743d01c3 for qemu.org

commit 7b743d01c32d618190861209c69522cae8ef3276
Author: Thomas Huth <thuth@redhat.com>
Date:   Wed Mar 11 21:25:03 2026 +0100

    target/xtensa/cpu: Move initialization of memory region to realize function

    When introspecting the xtensa CPUs from the command line, QEMU currently
    crashes:

     $ ./qemu-system-xtensa -device dc233c-xtensa-cpu,help
     qemu-system-xtensa: ../../devel/qemu/system/physmem.c:1401:
      register_multipage: Assertion `num_pages' failed.
     Aborted (core dumped)

    Move the initialization of the memory regions to the realize function
    to fix this problem.

    Reported-by: Markus Armbruster <armbru@redhat.com>
    Tested-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Thomas Huth <thuth@redhat.com>
    Message-ID: <20260311202503.107026-1-thuth@redhat.com>

diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index 86ec899a67..eebf40559b 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -244,6 +244,14 @@ static void xtensa_cpu_realizefn(DeviceState *dev, Error **errp)
     Error *local_err = NULL;

 #ifndef CONFIG_USER_ONLY
+    CPUXtensaState *env = &XTENSA_CPU(dev)->env;
+
+    env->address_space_er = g_malloc(sizeof(*env->address_space_er));
+    env->system_er = g_malloc(sizeof(*env->system_er));
+    memory_region_init_io(env->system_er, OBJECT(dev), NULL, env, "er",
+                          UINT64_C(0x100000000));
+    address_space_init(env->address_space_er, env->system_er, "ER");
+
     xtensa_irq_init(&XTENSA_CPU(dev)->env);
 #endif

@@ -269,12 +277,6 @@ static void xtensa_cpu_initfn(Object *obj)
     env->config = xcc->config;

 #ifndef CONFIG_USER_ONLY
-    env->address_space_er = g_malloc(sizeof(*env->address_space_er));
-    env->system_er = g_malloc(sizeof(*env->system_er));
-    memory_region_init_io(env->system_er, obj, NULL, env, "er",
-                          UINT64_C(0x100000000));
-    address_space_init(env->address_space_er, env->system_er, "ER");
-
     cpu->clock = qdev_init_clock_in(DEVICE(obj), "clk-in", NULL, cpu, 0);
     clock_set_hz(cpu->clock, env->config->clock_freq_khz * 1000);
 #endif