KVM: vVMX: rename label for post-enter_guest_mode consistency check

Rename 'fail' to 'vmentry_fail_vmexit_guest_mode' to make it more
obvious that it's simply a different entry point to the VMExit path,
whose purpose is unwind the updates done prior to calling
prepare_vmcs02().

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 7906dd4899e748b2fcb10183b6e2b24db750d470..7cae4f8c4f23d27abecd411b4f04ffa6f34b566b 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -12675,7 +12675,7 @@ static int nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,
                vcpu->arch.tsc_offset += vmcs12->tsc_offset;
 
        if (prepare_vmcs02(vcpu, vmcs12, &exit_qual))
-               goto fail;
+               goto vmentry_fail_vmexit_guest_mode;
 
        if (from_vmentry) {
                nested_get_vmcs12_pages(vcpu);
@@ -12685,7 +12685,7 @@ static int nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,
                                                vmcs12->vm_entry_msr_load_addr,
                                                vmcs12->vm_entry_msr_load_count);
                if (exit_qual)
-                       goto fail;
+                       goto vmentry_fail_vmexit_guest_mode;
        } else {
                /*
                 * The MMU is not initialized to point at the right entities yet and
@@ -12727,7 +12727,7 @@ static int nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,
         * VMEnter to L2 is a variation of a normal VMexit, as explained in
         * 26.7 "VM-entry failures during or after loading guest state".
         */
-fail:
+vmentry_fail_vmexit_guest_mode:
        if (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETING)
                vcpu->arch.tsc_offset -= vmcs12->tsc_offset;
        leave_guest_mode(vcpu);