From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 10 Nov 2015 13:09:17 +0000 (+0900)
Subject: Merge tag 'v2.4.1' into tizen_3.0_develop
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~175
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be6540fef422bf5d63edf0a53d2e94c41ff173e6;p=sdk%2Femulator%2Fqemu.git

Merge tag 'v2.4.1' into tizen_3.0_develop

v2.4.1

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

be6540fef422bf5d63edf0a53d2e94c41ff173e6
diff --cc cpus.c
index ce4fa3876a,7841fd8ae0..b4c53491ff
--- a/cpus.c
+++ b/cpus.c
@@@ -1184,11 -1122,7 +1184,12 @@@ static void qemu_cpu_kick_thread(CPUSta
  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) {
++    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;
      }
@@@ -1231,14 -1165,8 +1232,11 @@@ void qemu_mutex_lock_iothread(void
      /* In the simple case there is no need to bump the VCPU thread out of
       * TCG code execution.
       */
- #ifdef CONFIG_HAX
-     if (!tcg_enabled() || qemu_in_vcpu_thread() ||
-         !first_cpu || !first_cpu->thread ||
-         (hax_enabled() && hax_ug_platform())) {
- #else
      if (!tcg_enabled() || qemu_in_vcpu_thread() ||
-         !first_cpu || !first_cpu->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);
      } else {