commit 7f38c7f905384c064b88fbdfa2eb054a92be63f3
author David 'Digit' Turner <digit@google.com> Wed Mar 26 10:20:11 2014 +0100
committer David 'Digit' Turner <digit@google.com> Wed Apr 09 19:43:26 2014 +0200
tree 5adf44c6afc0904cb1469dc772179d3823e170c7
parent e36a683b547e540c68bf9c5578e05b29c8676f47

hax: CPUOldState -> CPUState

Change-Id: I4352da69e3a4e064a9fbaebee1dcb717cbb329b7

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index d963f8f..9bc29d3 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -224,7 +224,7 @@
 {
     CPUState *cpu = ENV_GET_CPU(env);
 #ifdef CONFIG_HAX
-    if (!hax_enabled() || hax_vcpu_emulation_mode(env))
+    if (!hax_enabled() || hax_vcpu_emulation_mode(cpu))
         return cpu->interrupt_request;
     return 0;
 #else
@@ -314,12 +314,12 @@
             }
 
 #ifdef CONFIG_HAX
-            if (hax_enabled() && !hax_vcpu_exec(env))
+            if (hax_enabled() && !hax_vcpu_exec(cpu))
                 longjmp(env->jmp_env, 1);
 #endif
 
             if (kvm_enabled()) {
-                kvm_cpu_exec(ENV_GET_CPU(env));
+                kvm_cpu_exec(cpu);
                 longjmp(env->jmp_env, 1);
             }
 
@@ -624,7 +624,7 @@
                 }
                 env->current_tb = NULL;
 #ifdef CONFIG_HAX
-                if (hax_enabled() && hax_stop_emulation(env))
+                if (hax_enabled() && hax_stop_emulation(cpu))
                     cpu_loop_exit(env);
 #endif
                 /* reset soft MMU for next block (it can currently