All code now get the vcpu first address space using cpu_get_address_space(). Nothing uses the CPUState::as field anymore: remove it.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/core/cpu.h | 3 --- hw/core/cpu-common.c | 1 - system/cpus.c | 2 +- system/physmem.c | 10 ---------- 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index c9f40c25392..0f7eda1a10d 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -443,8 +443,6 @@ struct qemu_work_item; * @cpu_ases: Pointer to array of CPUAddressSpaces (which define the * AddressSpaces this CPU has) * @num_ases: number of CPUAddressSpaces in @cpu_ases - * @as: Pointer to the first AddressSpace, for the convenience of targets which - * only have a single AddressSpace * @gdb_regs: Additional GDB registers. * @gdb_num_regs: Number of total registers accessible to GDB. * @gdb_num_g_regs: Number of registers in GDB 'g' packets. @@ -517,7 +515,6 @@ struct CPUState { struct CPUAddressSpace *cpu_ases; int cpu_ases_count; int num_ases; - AddressSpace *as; MemoryRegion *memory; struct CPUJumpCache *tb_jmp_cache; diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 41a339903ca..e46863d9e1d 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -307,7 +307,6 @@ static void cpu_common_initfn(Object *obj) cpu->cpu_index = UNASSIGNED_CPU_INDEX; cpu->cluster_index = UNASSIGNED_CLUSTER_INDEX; - cpu->as = NULL; cpu->num_ases = 0; /* user-mode doesn't have configurable SMP topology */ /* the default value is changed by qemu_init_vcpu() for system-mode */ diff --git a/system/cpus.c b/system/cpus.c index aa7bfcf56e5..ecd025a611d 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -704,7 +704,7 @@ void qemu_init_vcpu(CPUState *cpu) cpu->stopped = true; cpu->random_seed = qemu_guest_random_seed_thread_part1(); - if (!cpu->as) { + if (cpu->num_ases == 0) { /* If the target cpu hasn't set up any address spaces itself, * give it the default one. */ diff --git a/system/physmem.c b/system/physmem.c index b245cd14d43..31286b3c13f 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -791,11 +791,6 @@ void cpu_address_space_init(CPUState *cpu, int asidx, /* Target code should have set num_ases before calling us */ assert(asidx < cpu->num_ases); - if (asidx == 0) { - /* address space 0 gets the convenience alias */ - cpu->as = as; - } - if (!cpu->cpu_ases) { cpu->cpu_ases = g_new0(CPUAddressSpace, cpu->num_ases); cpu->cpu_ases_count = cpu->num_ases; @@ -827,11 +822,6 @@ void cpu_address_space_destroy(CPUState *cpu, int asidx) address_space_destroy(cpuas->as); g_free_rcu(cpuas->as, rcu); - if (asidx == 0) { - /* reset the convenience alias for address space 0 */ - cpu->as = NULL; - } - if (--cpu->cpu_ases_count == 0) { g_free(cpu->cpu_ases); cpu->cpu_ases = NULL; -- 2.51.0
