1
0
Fork 0

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: Paolo Bonzini <pbonzini@redhat.com>
alistair/sunxi64-5.4-dsi
Paolo Bonzini 2019-06-06 14:57:25 +02:00
parent beb8d93b3e
commit 2ea7203980
1 changed files with 2 additions and 5 deletions

View File

@ -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);