[Qemu-devel] [PATCH v2 5/5] target-mips: Pass MIPSCPU to mips_vpe_sleep()

[Andreas Färber]

Needed for moving halted field to CPUState.

Signed-off-by: Andreas Färber <address@hidden>
---
 target-mips/op_helper.c |   10 +++++++---
 1 Datei geändert, 7 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index 5710dd0..05b7730 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -731,8 +731,10 @@ static inline void mips_vpe_wake(CPUMIPSState *c)
     cpu_interrupt(c, CPU_INTERRUPT_WAKE);
 }
 
-static inline void mips_vpe_sleep(CPUMIPSState *c)
+static inline void mips_vpe_sleep(MIPSCPU *cpu)
 {
+    CPUMIPSState *c = &cpu->env;
+
     /* The VPE was shut off, really go to bed.
        Reset any old _WAKE requests.  */
     c->halted = 1;
@@ -755,7 +757,7 @@ static inline void mips_tc_sleep(MIPSCPU *cpu, int tc)
 
     /* FIXME: TC reschedule.  */
     if (!mips_vpe_active(c)) {
-        mips_vpe_sleep(c);
+        mips_vpe_sleep(cpu);
     }
 }
 
@@ -1889,8 +1891,10 @@ target_ulong helper_dvpe(CPUMIPSState *env)
     do {
         /* Turn off all VPEs except the one executing the dvpe.  */
         if (other_cpu_env != env) {
+            MIPSCPU *other_cpu = mips_env_get_cpu(other_cpu_env);
+
             other_cpu_env->mvp->CP0_MVPControl &= ~(1 << CP0MVPCo_EVP);
-            mips_vpe_sleep(other_cpu_env);
+            mips_vpe_sleep(other_cpu);
         }
         other_cpu_env = other_cpu_env->next_cpu;
     } while (other_cpu_env);
-- 
1.7.10.4