Message ID | 1438963713-10460-3-git-send-email-eric.auger@linaro.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <patchwork-forward+bncBDU5RLWMTQJRBNNQSOXAKGQE65WSF6Y@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 3DD2122EAD for <linaro@patches.linaro.org>; Fri, 7 Aug 2015 16:09:26 +0000 (UTC) Received: by lbsm2 with SMTP id m2sf6295996lbs.1 for <linaro@patches.linaro.org>; Fri, 07 Aug 2015 09:09:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=vPW0sJYK2BGXZ/vKJJxYpmqDH4LjvzllCjYMHpcSuKY=; b=R3zn6MOyv0AeKEUX6thMGFP9G1LKMB6avpUO1deXHcmU0qcI5KA7bv2NhZMS7dRHp8 Ds43PnFZmv7xUMYHGiu0o5rjErMvVOnTFXvaIkVkQ/BJgxDOab/9ZvFXYkCm9rgcGUvf Y11jA8N5HSd9UEJEmDj3iaJ6jPVsaZh4bWJcvsBR3JrUNx1Oy//OqVmiqU8n6liqjSq7 9fG2NHJMpD8TKAn3uoAihWIfmjumZWKqZgnh8YQPUl7bg1tYKqTWJz7qzIaCtoiVtEWu 0rX1wEUev/SKBZUPoKOM74SIMozm35w0O/UsAV8ZsJJ7IwCo3t6SApzO6htPlYohReRv exqg== X-Gm-Message-State: ALoCoQlbG8AnI/J5wl83Avr9oXtOi5L3IZHKRMQR+w6ZEFwfTkxt3uQrLQhWUorh+U2YjhzRy9BG X-Received: by 10.112.148.101 with SMTP id tr5mr2328208lbb.13.1438963765235; Fri, 07 Aug 2015 09:09:25 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.108 with SMTP id kx12ls335941lac.51.gmail; Fri, 07 Aug 2015 09:09:24 -0700 (PDT) X-Received: by 10.112.202.234 with SMTP id kl10mr8378953lbc.51.1438963764902; Fri, 07 Aug 2015 09:09:24 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id ld20si7819633lbb.61.2015.08.07.09.09.24 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Aug 2015 09:09:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by labjt7 with SMTP id jt7so52723475lab.0 for <patchwork-forward@linaro.org>; Fri, 07 Aug 2015 09:09:24 -0700 (PDT) X-Received: by 10.112.209.106 with SMTP id ml10mr8315362lbc.112.1438963764653; Fri, 07 Aug 2015 09:09:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.7.198 with SMTP id l6csp480565lba; Fri, 7 Aug 2015 09:09:24 -0700 (PDT) X-Received: by 10.112.143.74 with SMTP id sc10mr8408614lbb.116.1438963764121; Fri, 07 Aug 2015 09:09:24 -0700 (PDT) Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com. [209.85.212.176]) by mx.google.com with ESMTPS id ei6si11866088wid.102.2015.08.07.09.09.23 for <patches@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Aug 2015 09:09:24 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.176 as permitted sender) client-ip=209.85.212.176; Received: by wijp15 with SMTP id p15so65650344wij.0 for <patches@linaro.org>; Fri, 07 Aug 2015 09:09:23 -0700 (PDT) X-Received: by 10.194.122.132 with SMTP id ls4mr15671732wjb.130.1438963763826; Fri, 07 Aug 2015 09:09:23 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id by17sm9127438wib.18.2015.08.07.09.09.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Aug 2015 09:09:22 -0700 (PDT) From: Eric Auger <eric.auger@linaro.org> To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, drjones@redhat.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, patches@linaro.org, pbonzini@redhat.com Subject: [PATCH v2 2/4] KVM: arm/arm64: check power_off in kvm_arch_vcpu_runnable Date: Fri, 7 Aug 2015 18:08:31 +0200 Message-Id: <1438963713-10460-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438963713-10460-1-git-send-email-eric.auger@linaro.org> References: <1438963713-10460-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 3ac6b4c..4f50be3 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -347,7 +347,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 */
kvm_arch_vcpu_runnable now also checks whether the power_off flag is set. Signed-off-by: Eric Auger <eric.auger@linaro.org> --- arch/arm/kvm/arm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)