From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH 6/11] kvm-x86: VCPU with pending NMI is runnabled Date: Mon, 22 Sep 2008 09:58:48 +0200 Message-ID: <48D75038.1060909@siemens.com> References: <48D74CE6.5060008@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: "Yang, Sheng" , Avi Kivity , Gleb Natapov To: kvm-devel Return-path: Received: from lizzard.sbs.de ([194.138.37.39]:18888 "EHLO lizzard.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751841AbYIVIDR (ORCPT ); Mon, 22 Sep 2008 04:03:17 -0400 In-Reply-To: <48D74CE6.5060008@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: Ensure that a VCPU with pending NMIs is considered runnable. Signed-off-by: Jan Kiszka --- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: b/arch/x86/kvm/x86.c =================================================================== --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4372,7 +4372,8 @@ void kvm_arch_flush_shadow(struct kvm *k int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) { return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE - || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED; + || vcpu->arch.mp_state == KVM_MP_STATE_SIPI_RECEIVED + || vcpu->arch.nmi_pending; } static void vcpu_kick_intr(void *info)