diff options
| author | yucheng yu <yu-cheng.yu@intel.com> | 2014-09-29 17:18:27 -0700 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-10-07 17:49:25 +0900 |
| commit | d9ef78b5f17db3ab61e2770a2e34c4639672a72b (patch) | |
| tree | aa644789f37ed5ba406cc94e5f25f6e1f6bc0be1 /cpu-exec.c | |
| parent | 842c61a92039093c86fc8f12cc58d18f884ab0e3 (diff) | |
| download | qemu-d9ef78b5f17db3ab61e2770a2e34c4639672a72b.tar.gz qemu-d9ef78b5f17db3ab61e2770a2e34c4639672a72b.tar.bz2 qemu-d9ef78b5f17db3ab61e2770a2e34c4639672a72b.zip | |
hax: clean up
Changed Haxm global function interface from CPUArchState to CPUState.
Removed Haxm code from kvm.h and cpu.h.
Removed CONFIG_HAX_BACKEND.
Additional modification:
Fixed Compilation error on linux.
Removed warnings.
Using "hax-stub.c" if CONFIG_HAX is not defined.
Change-Id: I52ab99f1650bdd81b6c0efa61e4f9f3c4d766512
Signed-off-by: Yucheng Yu <yu-cheng.yu@intel.com>
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index c07c8af9cd..64a6150fc0 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -223,8 +223,7 @@ volatile sig_atomic_t exit_request; static int need_handle_intr_request(CPUState *cpu) { #ifdef CONFIG_HAX - CPUArchState *env = cpu->env_ptr; - if (!hax_enabled() || hax_vcpu_emulation_mode(env)) + if (!hax_enabled() || hax_vcpu_emulation_mode(cpu)) return cpu->interrupt_request; return 0; #else @@ -333,7 +332,7 @@ int cpu_exec(CPUArchState *env) } #ifdef CONFIG_HAX - if (hax_enabled() && !hax_vcpu_exec(env)) + if (hax_enabled() && !hax_vcpu_exec(cpu)) longjmp(cpu->jmp_env, 1); #endif @@ -711,7 +710,7 @@ int cpu_exec(CPUArchState *env) } cpu->current_tb = NULL; #ifdef CONFIG_HAX - if (hax_enabled() && hax_stop_emulation(env)) + if (hax_enabled() && hax_stop_emulation(cpu)) cpu_loop_exit(cpu); #endif /* reset soft MMU for next block (it can currently |