From patchwork Wed Mar 21 12:36:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 147974 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1E782B6F98 for ; Wed, 21 Mar 2012 23:36:50 +1100 (EST) Received: from localhost ([::1]:40627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAKmT-0001nE-P4 for incoming@patchwork.ozlabs.org; Wed, 21 Mar 2012 08:36:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAKmJ-0001lo-O5 for qemu-devel@nongnu.org; Wed, 21 Mar 2012 08:36:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAKmE-0000Dd-Cb for qemu-devel@nongnu.org; Wed, 21 Mar 2012 08:36:35 -0400 Received: from thoth.sbs.de ([192.35.17.2]:26298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAKmE-0000D3-2v for qemu-devel@nongnu.org; Wed, 21 Mar 2012 08:36:30 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id q2LCaOCA024103; Wed, 21 Mar 2012 13:36:24 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q2LCaM03029593; Wed, 21 Mar 2012 13:36:23 +0100 Message-ID: <4F69CB46.5050107@siemens.com> Date: Wed, 21 Mar 2012 13:36:22 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: qemu-devel , kvm Subject: [Qemu-devel] [PATCH uq/master] kvm: Drop redundant kvm_enabled from cpu_thread_is_idle X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is now implied by kvm_irqchip_in_kernel. Signed-off-by: Jan Kiszka --- cpus.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) 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;