Commit 2ea72039 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: nVMX: small cleanup in handle_exception 



The reason for skipping handling of NMI and #MC in handle_exception is
the same, namely they are handled earlier by vmx_complete_atomic_exit.
Calling the machine check handler (which just returns 1) is misleading,
don't do it.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent beb8d93b

arch/x86/kvm/vmx/vmx.c

+2 −5
Original line number Diff line number Diff line
@@ -4455,11 +4455,8 @@ static int handle_exception(struct kvm_vcpu *vcpu) 
	vect_info = vmx->idt_vectoring_info;

	intr_info = vmx->exit_intr_info;



	if (is_machine_check(intr_info))

		return handle_machine_check(vcpu);



	if (is_nmi(intr_info))

		return 1;  /* already handled by vmx_vcpu_run() */

	if (is_machine_check(intr_info) || is_nmi(intr_info))

		return 1;  /* already handled by vmx_complete_atomic_exit */



	if (is_invalid_opcode(intr_info))

		return handle_ud(vcpu);