Commit a5f01f8e authored by Wanpeng Li's avatar Wanpeng Li Committed by Radim Krčmář
Browse files

KVM: X86: Don't block vCPU if there is pending exception 



Don't block vCPU if there is pending exception.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 67034bb9

arch/x86/kvm/x86.c

+3 −0
Original line number Diff line number Diff line
@@ -8461,6 +8461,9 @@ static inline bool kvm_vcpu_has_events(struct kvm_vcpu *vcpu) 
	if (vcpu->arch.pv.pv_unhalted)

		return true;



	if (vcpu->arch.exception.pending)

		return true;



	if (kvm_test_request(KVM_REQ_NMI, vcpu) ||

	    (vcpu->arch.nmi_pending &&

	     kvm_x86_ops->nmi_allowed(vcpu)))