Commit 39f9c388 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

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: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a633e41e

arch/x86/kvm/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE