KVM: Use generalized exception queue for injecting #UD

Signed-off-by: Avi Kivity <avi@qumranet.com>

1 files changed, 1 insertions, 10 deletions

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 3b3c5f7d2e7c..3b44573c326e 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -613,14 +613,6 @@ static bool vmx_exception_injected(struct kvm_vcpu *vcpu)
         return !(vmx->idt_vectoring_info & VECTORING_INFO_VALID_MASK);
 }
 
-static void vmx_inject_ud(struct kvm_vcpu *vcpu)
-{
-        vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
-                     UD_VECTOR |
-                     INTR_TYPE_EXCEPTION |
-                     INTR_INFO_VALID_MASK);
-}
-
 /*
  * Swap MSR entry in host/guest MSR entry array.
  */
@@ -1866,8 +1858,7 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         if (is_invalid_opcode(intr_info)) {
                 er = emulate_instruction(vcpu, kvm_run, 0, 0, 0);
                 if (er != EMULATE_DONE)
-                        vmx_inject_ud(vcpu);
-
+                        kvm_queue_exception(vcpu, UD_VECTOR);
                 return 1;
         }