Commit 0496fbb9 authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: x86: VCPU with pending NMI is runnabled 



Ensure that a VCPU with pending NMIs is considered runnable.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 23930f95

arch/x86/kvm/x86.c

+2 −1
Original line number Diff line number Diff line
@@ -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)