Message ID | 1443217277-13173-3-git-send-email-eric.auger@linaro.org |
---|---|
State | Accepted |
Commit | 4f5f1dc03606e18986b874f899cf86b0a3e4f2a5 |
Headers | show
Return-Path: <patchwork-forward+bncBDU5RLWMTQJRBSP7S2YAKGQEOSKBVKQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id A277822FD1 for <linaro@patches.linaro.org>; Fri, 25 Sep 2015 21:42:34 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf14036498wic.3 for <linaro@patches.linaro.org>; Fri, 25 Sep 2015 14:42:33 -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=1LWI9bBj+KDZnOG/uISh3NaQrkF8KIvfrPwqOhsoxVM=; b=MPISGbanLPlfuSoYtlk/OM4rZ7PRjBvaN3AxTpohOvHEZa+9jo1jYj/5l1DF/GGj4r cmOLzAY01lxBsrYljOt6C7JXteGQqipXh+Ytp/YmkxEEVevgFbrADDf8FSND7a7EN5Ou cWt98qu4tvxEOsQ9HicDdmVTO3Nb1nUWcLoPZNAWQFGFNZ7s6rxQGv7cMe01JKR0UsK8 LxY5bHdQy9gOGFR16j3X2+6snzVleb+v7BMiXJlnL1606TcoTRfqyz8JixVdCN2J+mP5 G5Z5DDa94IkBb+bcxcGvG/JzfCPiPlEWbpYuR0311t2iwcOuhvasOxXZE0cc/XHQOFL4 CQ6w== X-Gm-Message-State: ALoCoQlV9yMQGG/rAjXRf7k22j1MdVPI4xSrpJqZKTp9v99p0iGTZ2eN2vErPfoq6LhXyBRw0LLF X-Received: by 10.180.210.71 with SMTP id ms7mr890569wic.4.1443217353949; Fri, 25 Sep 2015 14:42:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.73 with SMTP id kw9ls37943lac.51.gmail; Fri, 25 Sep 2015 14:42:33 -0700 (PDT) X-Received: by 10.152.28.167 with SMTP id c7mr2254582lah.17.1443217353806; Fri, 25 Sep 2015 14:42:33 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id ec5si2531556lbc.119.2015.09.25.14.42.33 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2015 14:42:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lacdq2 with SMTP id dq2so56673321lac.1 for <patchwork-forward@linaro.org>; Fri, 25 Sep 2015 14:42:33 -0700 (PDT) X-Received: by 10.152.26.98 with SMTP id k2mr2258613lag.41.1443217353710; Fri, 25 Sep 2015 14:42:33 -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.59.35 with SMTP id w3csp279188lbq; Fri, 25 Sep 2015 14:42:32 -0700 (PDT) X-Received: by 10.66.235.42 with SMTP id uj10mr10350517pac.32.1443217352761; Fri, 25 Sep 2015 14:42:32 -0700 (PDT) Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com. [209.85.220.45]) by mx.google.com with ESMTPS id k3si8228884pbq.107.2015.09.25.14.42.32 for <patches@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2015 14:42:32 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.220.45 as permitted sender) client-ip=209.85.220.45; Received: by pacfv12 with SMTP id fv12so118516945pac.2 for <patches@linaro.org>; Fri, 25 Sep 2015 14:42:32 -0700 (PDT) X-Received: by 10.67.6.164 with SMTP id cv4mr10171652pad.59.1443217352406; Fri, 25 Sep 2015 14:42:32 -0700 (PDT) Received: from gnx2579.st.com. ([70.35.39.2]) by smtp.gmail.com with ESMTPSA id u1sm5606756pbz.56.2015.09.25.14.42.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2015 14:42:31 -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 Subject: [PATCH v3 2/4] KVM: arm/arm64: check power_off in kvm_arch_vcpu_runnable Date: Fri, 25 Sep 2015 23:41:15 +0200 Message-Id: <1443217277-13173-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443217277-13173-1-git-send-email-eric.auger@linaro.org> References: <1443217277-13173-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.49 as permitted sender) smtp.mailfrom=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 2b19ef7..9d16f76 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 */