Patchwork [uq/master] kvm: Drop redundant kvm_enabled from cpu_thread_is_idle

login
register
mail settings
Submitter Jan Kiszka
Date March 21, 2012, 12:36 p.m.
Message ID <4F69CB46.5050107@siemens.com>
Download mbox | patch
Permalink /patch/147974/
State New
Headers show

Comments

Jan Kiszka - March 21, 2012, 12:36 p.m.
This is now implied by kvm_irqchip_in_kernel.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 cpus.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Avi Kivity - March 21, 2012, 1:35 p.m.
On 03/21/2012 02:36 PM, Jan Kiszka wrote:
> This is now implied by kvm_irqchip_in_kernel.
>
>

Applied, thanks.

Patch

diff --git a/cpus.c b/cpus.c
index 17b055f..cf732b4 100644
--- a/cpus.c
+++ b/cpus.c
@@ -421,8 +421,7 @@  static bool cpu_thread_is_idle(CPUState *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;