hax: remove redundant comparison
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 10 Nov 2015 13:21:41 +0000 (22:21 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Tue, 10 Nov 2015 13:21:41 +0000 (22:21 +0900)
"(hax_enabled() && hax_ug_platform())" is always false when
tcg is enabled.

Change-Id: I1fed39c6e4e45b915792130882d5a3971583b3ed
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
cpus.c

diff --git a/cpus.c b/cpus.c
index b4c5349..5389f24 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -1184,12 +1184,7 @@ static void qemu_cpu_kick_thread(CPUState *cpu)
 void qemu_cpu_kick(CPUState *cpu)
 {
     qemu_cond_broadcast(cpu->halt_cond);
-#ifdef CONFIG_HAX
-    if (((hax_enabled()  && hax_ug_platform()) ||
-        !tcg_enabled()) && !cpu->thread_kicked) {
-#else
     if (!tcg_enabled() && !cpu->thread_kicked) {
-#endif
         qemu_cpu_kick_thread(cpu);
         cpu->thread_kicked = true;
     }
@@ -1233,9 +1228,6 @@ void qemu_mutex_lock_iothread(void)
      * TCG code execution.
      */
     if (!tcg_enabled() || qemu_in_vcpu_thread() ||
-#ifdef CONFIG_HAX
-        (hax_enabled() && hax_ug_platform()) ||
-#endif
         !first_cpu || !first_cpu->created) {
         qemu_mutex_lock(&qemu_global_mutex);
         atomic_dec(&iothread_requesting_mutex);