aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2008-09-26 09:30:53 +0200
committerAvi Kivity <avi@redhat.com>2008-12-31 16:51:42 +0200
commit0496fbb973ccc9477082e859ed0faab5acb805ba (patch)
tree2706b5f714d5b20f892e9fc985c33d6f7377393a
parent23930f9521c9c4d4aa96cdb9d1e1703f3782bb94 (diff)
downloadmrst-s0i3-test-0496fbb973ccc9477082e859ed0faab5acb805ba.tar.gz
mrst-s0i3-test-0496fbb973ccc9477082e859ed0faab5acb805ba.tar.xz
mrst-s0i3-test-0496fbb973ccc9477082e859ed0faab5acb805ba.zip
KVM: x86: VCPU with pending NMI is runnabled
Ensure that a VCPU with pending NMIs is considered runnable. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 1a71f673559..1fa9a6db633 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4130,7 +4130,8 @@ void kvm_arch_flush_shadow(struct kvm *kvm)
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)