From patchwork Wed Nov 4 14:49:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 7550691 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A45C1BF90C for ; Wed, 4 Nov 2015 14:53:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C290620524 for ; Wed, 4 Nov 2015 14:53:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A969206E8 for ; Wed, 4 Nov 2015 14:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965551AbbKDOxp (ORCPT ); Wed, 4 Nov 2015 09:53:45 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36850 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965614AbbKDOxK (ORCPT ); Wed, 4 Nov 2015 09:53:10 -0500 Received: by wmec75 with SMTP id c75so115234640wme.1 for ; Wed, 04 Nov 2015 06:53:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VGY9/Rk6i5a4QEuXxD6u+ORn0pUhCA2XgyuJUWQ7B/Q=; b=wfb2SgEghXaSlYVOaKHp3EJVWTheaTdV0xL0BwqRA75mzLkJiQHRU5pHxIBS/iSsXI ox9N73T7jwNOWDDh+yGrG30AHL+85SoPMuFp9bzKxd9mGWG1/Va7basmSD+TzjdMYF4J V54ycnKU2Jguh0ao4B7Ogt8Fv/t3mWQNX7e8+aX59UveO3XR6bxkPxOcoiG9qjm0Mt1s cxBMg39p2shQzQ473/6GkhbEIJf5oPY4H1Hl+2vPrSpUE1twZ9Y3xxYrh6w5gOZhQEM7 v5wWnhPUGaquznjICz9sthV4vBPNCclJ2mOMFjVdXyQT80beBqQF7fpN7KykE+YsgSEi lgwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VGY9/Rk6i5a4QEuXxD6u+ORn0pUhCA2XgyuJUWQ7B/Q=; b=Un51jrPaT44tm791po0ddiPY1p/ZG1EjWoklnooynbWOIvm/vPez4lsJKkRaXTPwAF ixb1GkPMMpggKu88HGlhG6L9P3eIU7kVrkioU+qkdE7mpAIwE5DTDg1wDksiYw21WLWl PE1+XBUrf/OFzwdU8b+tmPvRvN1lqjAm1GUKuFGAFa58F7MM2SxY0o//HVQTJxmLdgpk E7mNtYZ+PwTYeob2OwC8jQopZw8I0kRObcoAfoFNfGzbM7gdp+EYgyibmzo4HHPongPS NUCw5uSBVm1sWK8OStJnvLq2GDCtSAG33lXQRXo8GAj9soJQXD+ikxmTA3+uNso5Qrsm YQgA== X-Gm-Message-State: ALoCoQmV2ZOBKXDf+YCWj4dPITJ7xh6EO0sJ0z/U3yHFuaECjxQ7iRYDd4l45eIUKIE7UXFkDBZw X-Received: by 10.28.12.11 with SMTP id 11mr3658119wmm.99.1446648789578; Wed, 04 Nov 2015 06:53:09 -0800 (PST) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id e9sm1985081wjw.8.2015.11.04.06.53.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Nov 2015 06:53:09 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier , Eric Auger , Christoffer Dall Subject: [PULL 11/21] KVM: arm/arm64: check power_off in kvm_arch_vcpu_runnable Date: Wed, 4 Nov 2015 15:49:50 +0100 Message-Id: <1446648600-27297-12-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1446648600-27297-1-git-send-email-christoffer.dall@linaro.org> References: <1446648600-27297-1-git-send-email-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Auger kvm_arch_vcpu_runnable now also checks whether the power_off flag is set. Signed-off-by: Eric Auger Reviewed-by: Christoffer Dall Signed-off-by: Christoffer Dall --- arch/arm/kvm/arm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 9d2fb47..d04deeb 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -352,7 +352,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, */ int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) { - return !!v->arch.irq_lines || kvm_vgic_vcpu_pending_irq(v); + return ((!!v->arch.irq_lines || kvm_vgic_vcpu_pending_irq(v)) + && !v->arch.power_off); } /* Just ensure a guest exit from a particular CPU */