Merge branch 'linux-user.next' of git://git.linaro.org/people/pmaydell/qemu-arm

[qemu.git] / cpus.c

diff --git a/cpus.c b/cpus.c
index 3de2e27f41c3f7fc86fc0df9fcbca7aa40b49390..e476a3cd5e0820b177dbe435a59803d3abfff6fa 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -70,7 +70,8 @@ static bool cpu_thread_is_idle(CPUArchState *env)
     if (env->stopped || !runstate_is_running()) {
         return true;
     }
-    if (!env->halted || qemu_cpu_has_work(env) || kvm_irqchip_in_kernel()) {
+    if (!env->halted || qemu_cpu_has_work(env) ||
+        kvm_async_interrupts_enabled()) {
         return false;
     }
     return true;