4 files changed, 12 insertions, 13 deletions

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 9d8de5dd7546..8d11ddcb0dbf 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -954,9 +954,7 @@ struct kvm_x86_ops {
                                 unsigned char *hypercall_addr);
         void (*set_irq)(struct kvm_vcpu *vcpu);
         void (*set_nmi)(struct kvm_vcpu *vcpu);
-        void (*queue_exception)(struct kvm_vcpu *vcpu, unsigned nr,
-                                bool has_error_code, u32 error_code,
-                                bool reinject);
+        void (*queue_exception)(struct kvm_vcpu *vcpu);
         void (*cancel_injection)(struct kvm_vcpu *vcpu);
         int (*interrupt_allowed)(struct kvm_vcpu *vcpu);
         int (*nmi_allowed)(struct kvm_vcpu *vcpu);
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 4c98d362e3e4..cde756a02b1a 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -637,11 +637,13 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu)
         svm_set_interrupt_shadow(vcpu, 0);
 }
 
-static void svm_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
-                                bool has_error_code, u32 error_code,
-                                bool reinject)
+static void svm_queue_exception(struct kvm_vcpu *vcpu)
 {
         struct vcpu_svm *svm = to_svm(vcpu);
+        unsigned nr = vcpu->arch.exception.nr;
+        bool has_error_code = vcpu->arch.exception.has_error_code;
+        bool reinject = vcpu->arch.exception.reinject;
+        u32 error_code = vcpu->arch.exception.error_code;
 
         /*
          * If we are within a nested VM we'd better #VMEXIT and let the guest
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 25f2fdccf625..69cc228436ea 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2435,11 +2435,13 @@ static int nested_vmx_check_exception(struct kvm_vcpu *vcpu, unsigned nr)
         return 1;
 }
 
-static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
-                                bool has_error_code, u32 error_code,
-                                bool reinject)
+static void vmx_queue_exception(struct kvm_vcpu *vcpu)
 {
         struct vcpu_vmx *vmx = to_vmx(vcpu);
+        unsigned nr = vcpu->arch.exception.nr;
+        bool has_error_code = vcpu->arch.exception.has_error_code;
+        bool reinject = vcpu->arch.exception.reinject;
+        u32 error_code = vcpu->arch.exception.error_code;
         u32 intr_info = nr | INTR_INFO_VALID_MASK;
 
         if (!reinject && is_guest_mode(vcpu) &&
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 4f41c5222ecd..e149c92476f1 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6356,10 +6356,7 @@ static int inject_pending_event(struct kvm_vcpu *vcpu, bool req_int_win)
                         kvm_update_dr7(vcpu);
                 }
 
-                kvm_x86_ops->queue_exception(vcpu, vcpu->arch.exception.nr,
-                                          vcpu->arch.exception.has_error_code,
-                                          vcpu->arch.exception.error_code,
-                                          vcpu->arch.exception.reinject);
+                kvm_x86_ops->queue_exception(vcpu);
                 return 0;
         }