Move the initialization of AS of index 0 (ARMASIdx_NS) so it happens before the initialization of the other address spaces. This is purely a code organization change with no effect on behavior.
Signed-off-by: Gustavo Romero <[email protected]> Suggested-by: Alex Bennée <[email protected]> --- target/arm/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 39292fb9bc..1640b20b4d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2158,6 +2158,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cs->num_ases = 1 + has_secure; } + cpu_address_space_init(cs, ARMASIdx_NS, "cpu-memory", cs->memory); + if (has_secure) { if (!cpu->secure_memory) { cpu->secure_memory = cs->memory; @@ -2175,8 +2177,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) } } - cpu_address_space_init(cs, ARMASIdx_NS, "cpu-memory", cs->memory); - /* No core_count specified, default to smp_cpus. */ if (cpu->core_count == -1) { cpu->core_count = smp_cpus; -- 2.34.1
