aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-03-21 13:36:22 +0100
committerMarcelo Tosatti <mtosatti@redhat.com>2012-04-12 19:01:41 -0300
commit56b9ead234439317629054fa370c547c652ab09a (patch)
tree5ccaa543b71c48844f15f49795ab4626553528a3
parentb3c09bde4842f1b157bc4431135aad4f2031e312 (diff)
downloadqemu-56b9ead234439317629054fa370c547c652ab09a.zip
qemu-56b9ead234439317629054fa370c547c652ab09a.tar.gz
qemu-56b9ead234439317629054fa370c547c652ab09a.tar.bz2
kvm: Drop redundant kvm_enabled from cpu_thread_is_idle
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>
-rw-r--r--cpus.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/cpus.c b/cpus.c
index eb22bd5..b182b3d 100644
--- 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;