summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-03 00:34:15 +0200
committerAndreas Färber <afaerber@suse.de>2012-10-31 01:02:44 +0100
commitb6444a42c06371d5abba78d2553a088a8490a65b (patch)
tree5f70c7bda91bdd1b253523e0892d2ec893dcdc25
parent4fdeee7cd4c8f90ef765537b9346a195d9483ab5 (diff)
downloadfocaccia-qemu-b6444a42c06371d5abba78d2553a088a8490a65b.tar.gz
focaccia-qemu-b6444a42c06371d5abba78d2553a088a8490a65b.zip
ppce500_spin: Store PowerPCCPU in SpinKick
Needed for moving stopped field to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--hw/ppce500_spin.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
index 55aa9dc8a2..04e7e65d44 100644
--- a/hw/ppce500_spin.c
+++ b/hw/ppce500_spin.c
@@ -49,7 +49,7 @@ typedef struct spin_state {
 } SpinState;
 
 typedef struct spin_kick {
-    CPUPPCState *env;
+    PowerPCCPU *cpu;
     SpinInfo *spin;
 } SpinKick;
 
@@ -92,7 +92,7 @@ static void mmubooke_create_initial_mapping(CPUPPCState *env,
 static void spin_kick(void *data)
 {
     SpinKick *kick = data;
-    CPUPPCState *env = kick->env;
+    CPUPPCState *env = &kick->cpu->env;
     SpinInfo *curspin = kick->spin;
     hwaddr map_size = 64 * 1024 * 1024;
     hwaddr map_start;
@@ -158,7 +158,7 @@ static void spin_write(void *opaque, hwaddr addr, uint64_t value,
     if (!(ldq_p(&curspin->addr) & 1)) {
         /* run CPU */
         SpinKick kick = {
-            .env = env,
+            .cpu = ppc_env_get_cpu(env),
             .spin = curspin,
         };