diff options
| author | Paolo Bonzini | 2019-06-06 14:57:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-06-18 11:46:01 +0200 |
| commit | 2ea72039808d50c909c2eb00eaebfaaaa743927a (patch) | |
| tree | a285544f0c8751878b4a15d437319a772e06c6e1 /arch/x86/kvm/vmx/vmx.c | |
| parent | KVM: VMX: Fix handling of #MC that occurs during VM-Entry (diff) | |
| download | kernel-qcow2-linux-2ea72039808d50c909c2eb00eaebfaaaa743927a.tar.gz kernel-qcow2-linux-2ea72039808d50c909c2eb00eaebfaaaa743927a.tar.xz kernel-qcow2-linux-2ea72039808d50c909c2eb00eaebfaaaa743927a.zip | |
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>
Diffstat (limited to 'arch/x86/kvm/vmx/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx/vmx.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 1b3ca0582a0c..da6c829bad9f 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -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); |