diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-29 22:29:20 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-07-09 21:32:54 +0200 |
| commit | 182735efaf956ccab50b6d74a4fed163e0f35660 (patch) | |
| tree | 1852a22a43ce7130f22fc96cd96712cfa7e00749 /hw/arm/boot.c | |
| parent | 9b056fcc5becd183fa2bdec9d259bf26b5f71207 (diff) | |
| download | qemu-182735efaf956ccab50b6d74a4fed163e0f35660.zip qemu-182735efaf956ccab50b6d74a4fed163e0f35660.tar.gz qemu-182735efaf956ccab50b6d74a4fed163e0f35660.tar.bz2 | |
cpu: Make first_cpu and next_cpu CPUState
Move next_cpu from CPU_COMMON to CPUState.
Move first_cpu variable to qom/cpu.h.
gdbstub needs to use CPUState::env_ptr for now.
cpu_copy() no longer needs to save and restore cpu_next.
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
[AF: Rebased, simplified cpu_copy()]
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/arm/boot.c')
| -rw-r--r-- | hw/arm/boot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 7c0090f..2b33444 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -333,7 +333,7 @@ static void do_cpu_reset(void *opaque) env->regs[15] = info->entry & 0xfffffffe; env->thumb = info->entry & 1; } else { - if (env == first_cpu) { + if (CPU(cpu) == first_cpu) { env->regs[15] = info->loader_start; if (!info->dtb_filename) { if (old_param) { @@ -351,7 +351,7 @@ static void do_cpu_reset(void *opaque) void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) { - CPUARMState *env = &cpu->env; + CPUState *cs = CPU(cpu); int kernel_size; int initrd_size; int n; @@ -476,9 +476,9 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) } info->is_linux = is_linux; - for (; env; env = env->next_cpu) { - cpu = arm_env_get_cpu(env); - env->boot_info = info; + for (; cs; cs = cs->next_cpu) { + cpu = ARM_CPU(cs); + cpu->env.boot_info = info; qemu_register_reset(do_cpu_reset, cpu); } } |