[PATCH v3 3/4] KVM: VMX: Move the nested_vmx_inject_exception_vmexit call from nested_vmx_check_exception to vmx_queue_exception

[Wanpeng Li]

From: Wanpeng Li <wanpeng...@hotmail.com>

Move the nested_vmx_inject_exception_vmexit call from 
nested_vmx_check_exception 
to vmx_queue_exception. 

Signed-off-by: Wanpeng Li <wanpeng...@hotmail.com>
---
 arch/x86/kvm/vmx.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 902b780..21760b8 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2459,15 +2459,14 @@ static void nested_vmx_inject_exception_vmexit(struct 
kvm_vcpu *vcpu,
  * KVM wants to inject page-faults which it got to the guest. This function
  * checks whether in a nested guest, we need to inject them to L1 or L2.
  */
-static int nested_vmx_check_exception(struct kvm_vcpu *vcpu)
+static int nested_vmx_check_exception(struct kvm_vcpu *vcpu, unsigned long 
*exit_qual)
 {
        struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
        unsigned int nr = vcpu->arch.exception.nr;
 
        if (nr == PF_VECTOR) {
                if (vcpu->arch.exception.nested_apf) {
-                       nested_vmx_inject_exception_vmexit(vcpu,
-                                                          
vcpu->arch.apf.nested_apf_token);
+                       *exit_qual = vcpu->arch.apf.nested_apf_token;
                        return 1;
                }
                /*
@@ -2481,16 +2480,15 @@ static int nested_vmx_check_exception(struct kvm_vcpu 
*vcpu)
                 */
                if (nested_vmx_is_page_fault_vmexit(vmcs12,
                                                    
vcpu->arch.exception.error_code)) {
-                       nested_vmx_inject_exception_vmexit(vcpu, 
vcpu->arch.cr2);
+                       *exit_qual = vcpu->arch.cr2;
                        return 1;
                }
        } else {
-               unsigned long exit_qual = 0;
-               if (nr == DB_VECTOR)
-                       exit_qual = vcpu->arch.dr6;
-
                if (vmcs12->exception_bitmap & (1u << nr)) {
-                       nested_vmx_inject_exception_vmexit(vcpu, exit_qual);
+                       if (nr == DB_VECTOR)
+                               *exit_qual = vcpu->arch.dr6;
+                       else
+                               *exit_qual = 0;
                        return 1;
                }
        }
@@ -2506,10 +2504,13 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu)
        bool reinject = vcpu->arch.exception.injected;
        u32 error_code = vcpu->arch.exception.error_code;
        u32 intr_info = nr | INTR_INFO_VALID_MASK;
+       unsigned long exit_qual;
 
        if (!reinject && is_guest_mode(vcpu) &&
-           nested_vmx_check_exception(vcpu))
+           nested_vmx_check_exception(vcpu, &exit_qual)) {
+               nested_vmx_inject_exception_vmexit(vcpu, exit_qual);
                return;
+       }
 
        if (has_error_code) {
                vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code);
-- 
2.7.4