diff options
author | Andreas Färber <afaerber@suse.de> | 2013-05-29 21:06:39 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2013-06-13 00:11:14 +0200 |
commit | c67e216bdf42abfb8505790b2da9562356103976 (patch) | |
tree | 06af864365509e242de2170bfeca6a0f4617bcd6 | |
parent | 05318a858c1212d845d03f924e6ab5f22ab51ab6 (diff) | |
download | qemu-c67e216bdf42abfb8505790b2da9562356103976.zip qemu-c67e216bdf42abfb8505790b2da9562356103976.tar.gz qemu-c67e216bdf42abfb8505790b2da9562356103976.tar.bz2 |
spapr_rtas: Abstract rtas_start_cpu() with qemu_get_cpu()
Instead of looping over all CPUArchState, use a helper to obtain the
desired CPUState.
Free the "cpu" variable for PowerPCCPU, to access its CPUPPCState.
Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r-- | hw/ppc/spapr_rtas.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index a1c3d20..f4bd3c9 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -160,8 +160,7 @@ static void rtas_start_cpu(sPAPREnvironment *spapr, uint32_t nret, target_ulong rets) { target_ulong id, start, r3; - CPUState *cpu; - CPUPPCState *env; + CPUState *cs; if (nargs != 3 || nret != 1) { rtas_st(rets, 0, -3); @@ -172,14 +171,12 @@ static void rtas_start_cpu(sPAPREnvironment *spapr, start = rtas_ld(args, 1); r3 = rtas_ld(args, 2); - for (env = first_cpu; env; env = env->next_cpu) { - cpu = CPU(ppc_env_get_cpu(env)); - - if (cpu->cpu_index != id) { - continue; - } + cs = qemu_get_cpu(id); + if (cs != NULL) { + PowerPCCPU *cpu = POWERPC_CPU(cs); + CPUPPCState *env = &cpu->env; - if (!cpu->halted) { + if (!cs->halted) { rtas_st(rets, 0, -1); return; } @@ -192,9 +189,9 @@ static void rtas_start_cpu(sPAPREnvironment *spapr, env->msr = (1ULL << MSR_SF) | (1ULL << MSR_ME); env->nip = start; env->gpr[3] = r3; - cpu->halted = 0; + cs->halted = 0; - qemu_cpu_kick(cpu); + qemu_cpu_kick(cs); rtas_st(rets, 0, 0); return; |