diff options
author | Wanpeng Li | 2018-04-04 01:28:48 +0200 |
---|---|---|
committer | Paolo Bonzini | 2018-04-04 19:03:58 +0200 |
commit | 082d06edab49f302eb96b7a9d029f52713156354 (patch) | |
tree | 18f6005208f65fbfa2a13f52ae47aeb18ee3bd77 /arch/x86/kvm/vmx.c | |
parent | KVM: vmx: unify adjacent #ifdefs (diff) | |
download | kernel-qcow2-linux-082d06edab49f302eb96b7a9d029f52713156354.tar.gz kernel-qcow2-linux-082d06edab49f302eb96b7a9d029f52713156354.tar.xz kernel-qcow2-linux-082d06edab49f302eb96b7a9d029f52713156354.zip |
KVM: X86: Introduce handle_ud()
Introduce handle_ud() to handle invalid opcode, this function will be
used by later patches.
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Liran Alon <liran.alon@oracle.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim KrÄmář <rkrcmar@redhat.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Liran Alon <liran.alon@oracle.com>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
-rw-r--r-- | arch/x86/kvm/vmx.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index a1572461786e..59d91516a622 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6434,14 +6434,8 @@ static int handle_exception(struct kvm_vcpu *vcpu) if (is_nmi(intr_info)) return 1; /* already handled by vmx_vcpu_run() */ - if (is_invalid_opcode(intr_info)) { - er = emulate_instruction(vcpu, EMULTYPE_TRAP_UD); - if (er == EMULATE_USER_EXIT) - return 0; - if (er != EMULATE_DONE) - kvm_queue_exception(vcpu, UD_VECTOR); - return 1; - } + if (is_invalid_opcode(intr_info)) + return handle_ud(vcpu); error_code = 0; if (intr_info & INTR_INFO_DELIVER_CODE_MASK) |