In order to remove the convenient CPUState::as field, access the vcpu first address space using the cpu_get_address_space() helper.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/arm/cpu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 30e29fd3153..f781d1cfd80 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -371,6 +371,7 @@ static void arm_cpu_reset_hold(Object *obj, ResetType type) if (arm_feature(env, ARM_FEATURE_M)) { #ifndef CONFIG_USER_ONLY + AddressSpace *as = cpu_get_address_space(cs, 0); uint32_t initial_msp; /* Loaded from 0x0 */ uint32_t initial_pc; /* Loaded from 0x4 */ uint8_t *rom; @@ -439,7 +440,7 @@ static void arm_cpu_reset_hold(Object *obj, ResetType type) /* Load the initial SP and PC from offset 0 and 4 in the vector table */ vecbase = env->v7m.vecbase[env->v7m.secure]; - rom = rom_ptr_for_as(cs->as, vecbase, 8); + rom = rom_ptr_for_as(as, vecbase, 8); if (rom) { /* Address zero is covered by ROM which hasn't yet been * copied into physical memory. @@ -452,8 +453,8 @@ static void arm_cpu_reset_hold(Object *obj, ResetType type) * it got copied into memory. In the latter case, rom_ptr * will return a NULL pointer and we should use ldl_phys instead. */ - initial_msp = ldl_phys(cs->as, vecbase); - initial_pc = ldl_phys(cs->as, vecbase + 4); + initial_msp = ldl_phys(as, vecbase); + initial_pc = ldl_phys(as, vecbase + 4); } qemu_log_mask(CPU_LOG_INT, -- 2.51.0
