Message ID | 1446648600-27297-12-git-send-email-christoffer.dall@linaro.org |
---|---|
State | New |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp2461054lbr; Wed, 4 Nov 2015 06:57:00 -0800 (PST) X-Received: by 10.68.143.40 with SMTP id sb8mr2277673pbb.107.1446649020105; Wed, 04 Nov 2015 06:57:00 -0800 (PST) Return-Path: <linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org> Received: from bombadil.infradead.org (bombadil.infradead.org. [198.137.202.9]) by mx.google.com with ESMTPS id yt1si328433pab.45.2015.11.04.06.56.59 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Nov 2015 06:57:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 198.137.202.9 as permitted sender) client-ip=198.137.202.9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 198.137.202.9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtzTZ-00081i-4H; Wed, 04 Nov 2015 14:55:49 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtzRL-000585-6O for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2015 14:53:34 +0000 Received: by wmll128 with SMTP id l128so116255083wml.0 for <linux-arm-kernel@lists.infradead.org>; 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=Rs+0TrQDIj+6tQlQI7FnvKnZeRZyqoJPFEEpgj7nZ6pMv59DjE90ES1XbvDTwdrDPI IFImMgXKlstFJyV+mxZEGRir0tJSsCcPtK5a9Exzr8GmkkbxqpjCpSNOcCPNvEx8XF+n CsgQi998Hzjq8tIPY6FS30kd0jz0CaBltf1Z5/DUSt5Llvw24SqP6Fy1JJwvAaltjRW9 S90K9doEzkSD7qFmWSmr4mnvfZtozS/y5I1EHNMZgJ8ynRHIXQGVImjN4YJHFE3Tlkh5 nZYYp5lltecbRQosOm2lKUdgqb/uL4TUAIo6dTMGIAwna6eOANRzf7IdRyou6i7tgHbI buXg== X-Gm-Message-State: ALoCoQlXOG1iEs+Cc7NtUuuSRUUzSH9QlSjK1aSzr2YuZm7vxyMwKilq8VzBWFG30MTywCne+1L0 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 <christoffer.dall@linaro.org> To: Paolo Bonzini <pbonzini@redhat.com>, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151104_065331_787859_52660AB3 X-CRM114-Status: GOOD ( 12.39 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:230 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Marc Zyngier <marc.zyngier@arm.com>, Christoffer Dall <christoffer.dall@linaro.org>, Eric Auger <eric.auger@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org |
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 */