Commit f9902069 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: VMX: Qualify check for host NMI 



Check for the exit reason first; this allows us, later,
to avoid a VMREAD for VM_EXIT_INTR_INFO_FIELD.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 9d58b931

arch/x86/kvm/vmx.c

+2 −1
Original line number Diff line number Diff line
@@ -3905,7 +3905,8 @@ static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx) 
		kvm_machine_check();



	/* We need to handle NMIs before interrupts are enabled */

	if ((exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR &&

	if (vmx->exit_reason == EXIT_REASON_EXCEPTION_NMI &&

	    (exit_intr_info & INTR_INFO_INTR_TYPE_MASK) == INTR_TYPE_NMI_INTR &&

	    (exit_intr_info & INTR_INFO_VALID_MASK)) {

		kvm_before_handle_nmi(&vmx->vcpu);

		asm("int $2");