diff mbox series

[v3,10/20] KVM: vVMX: rename label for post-enter_guest_mode consistency check

Message ID 20180926162358.10741-11-sean.j.christopherson@intel.com (mailing list archive)
State New, archived
Headers show
Series KVM: nVMX: add option to perform early consistency checks via H/W | expand

Commit Message

Sean Christopherson Sept. 26, 2018, 4:23 p.m. UTC 
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>
---
 arch/x86/kvm/vmx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Jim Mattson Sept. 26, 2018, 4:53 p.m. UTC | #1 
On Wed, Sep 26, 2018 at 9:23 AM, Sean Christopherson
<sean.j.christopherson@intel.com> wrote:
> 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>
diff mbox series

Patch

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 4188720758f8..b58f16ed2c10 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -12575,7 +12575,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);
@@ -12585,7 +12585,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
@@ -12610,7 +12610,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
 	 * 23.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);