]> git.proxmox.com Git - qemu.git/commitdiff
kvm: Drop redundant kvm_enabled from cpu_thread_is_idle
authorJan Kiszka <jan.kiszka@siemens.com>
Wed, 21 Mar 2012 12:36:22 +0000 (13:36 +0100)
committerMarcelo Tosatti <mtosatti@redhat.com>
Thu, 12 Apr 2012 22:01:41 +0000 (19:01 -0300)
This is now implied by kvm_irqchip_in_kernel.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
cpus.c

diff --git a/cpus.c b/cpus.c
index eb22bd5df19678ce5f73395769b44663b7cecdc9..b182b3d7d9884b580f279ed14e7faf0a4553f642 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -441,8 +441,7 @@ 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_enabled() && kvm_irqchip_in_kernel())) {
+    if (!env->halted || qemu_cpu_has_work(env) || kvm_irqchip_in_kernel()) {
         return false;
     }
     return true;