Revert "hax: modify some codes for QEMU 2.0"

This reverts commit 92d5793f73c463576a17d6a281cf7b3c8804aea0.

diff --git a/cpu-exec.c b/cpu-exec.c
index e119e4c..3fe9ffc 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -334,7 +334,7 @@ int cpu_exec(CPUArchState *env)
 
 #ifdef CONFIG_HAX
             if (hax_enabled() && !hax_vcpu_exec(env))
-                longjmp(cpu->jmp_env, 1);
+                longjmp(env->jmp_env, 1);
 #endif
 
             next_tb = 0; /* force lookup of first TB */

diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index 01c0ee8..2dd6206 100644 (file)
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -118,9 +118,5 @@ QEMU_BUILD_BUG_ON(sizeof(CPUTLBEntry) != (1 << CPU_TLB_ENTRY_BITS));
 #define CPU_COMMON                                                      \
     /* soft mmu support */                                              \
     CPU_COMMON_TLB                                                      \
-                                                                        \
-    /* for hax */                                                       \ 
-    int hax_vcpu_dirty;                                                 \ 
-    struct hax_vcpu_state *hax_vcpu;                                    \ 
 
 #endif

diff --git a/target-i386/hax-all.c b/target-i386/hax-all.c
index 83f1b66..cbc27ab 100644 (file)
--- a/target-i386/hax-all.c
+++ b/target-i386/hax-all.c
@@ -714,7 +714,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
                     /* hlt instruction with interrupt disabled is shutdown */
                     env->eflags |= IF_MASK;
                     cpu->halted = 1;
-                    cpu->exception_index = EXCP_HLT;
+                    env->exception_index = EXCP_HLT;
                     ret = HAX_EMUL_HLT;
                 }
                 break;
@@ -734,7 +734,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)
 
     if (cpu->exit_request) {
         cpu->exit_request = 0;
-        cpu->exception_index = EXCP_INTERRUPT;
+        env->exception_index = EXCP_INTERRUPT;
     }
     return ret;
 }