From patchwork Fri Apr 13 01:32:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 152240 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 476C3B6FEB for ; Fri, 13 Apr 2012 11:40:07 +1000 (EST) Received: from localhost ([::1]:57799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIVSG-0000N1-Fj for incoming@patchwork.ozlabs.org; Thu, 12 Apr 2012 21:37:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIVRV-0006bt-UL for qemu-devel@nongnu.org; Thu, 12 Apr 2012 21:36:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SIVRS-0002EU-Kk for qemu-devel@nongnu.org; Thu, 12 Apr 2012 21:36:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIVRS-0002Dz-CG for qemu-devel@nongnu.org; Thu, 12 Apr 2012 21:36:50 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3D1amiU003724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 12 Apr 2012 21:36:48 -0400 Received: from amt.cnet (vpn-8-174.rdu.redhat.com [10.11.8.174]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3D1aluK014997; Thu, 12 Apr 2012 21:36:47 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 2416F7A356; Thu, 12 Apr 2012 22:32:52 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id q3D1WoF7014003; Thu, 12 Apr 2012 22:32:50 -0300 From: Marcelo Tosatti To: Anthony Liguori Date: Thu, 12 Apr 2012 22:32:37 -0300 Message-Id: <56b9ead234439317629054fa370c547c652ab09a.1334280761.git.mtosatti@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jan Kiszka , qemu-devel@nongnu.org, kvm@vger.kernel.org, Avi Kivity Subject: [Qemu-devel] [PATCH 2/7] 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 From: Jan Kiszka This is now implied by kvm_irqchip_in_kernel. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity --- cpus.c | 3 +-- 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;