[PATCH 4.19 264/321] KVM: nVMX: rename enter_vmx_non_root_mode to nested_vmx_enter_non_root_mode

Greg Kroah-Hartman
2019-12-03T23:01:06Z

From: Sean Christopherson <sean.j.christopherson@intel.com>

commit d63907dc7dd11d98c8ffbdaf8311987e5a508744 upstream.

...to be more consistent with the nested VMX nomenclature.

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>
Cc: Jack Wang <jack.wang.usish@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
arch/x86/kvm/vmx.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -12680,7 +12680,7 @@ static int check_vmentry_postreqs(struct
* If exit_qual is NULL, this is being called from state restore (either RSM
* or KVM_SET_NESTED_STATE). Otherwise it's called from vmlaunch/vmresume.
*/
-static int enter_vmx_non_root_mode(struct kvm_vcpu *vcpu, u32 *exit_qual)
+static int nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, u32 *exit_qual)
{
struct vcpu_vmx *vmx = to_vmx(vcpu);
struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
@@ -12845,7 +12845,7 @@ static int nested_vmx_run(struct kvm_vcp
*/

vmx->nested.nested_run_pending = 1;
- ret = enter_vmx_non_root_mode(vcpu, &exit_qual);
+ ret = nested_vmx_enter_non_root_mode(vcpu, &exit_qual);
if (ret) {
nested_vmx_entry_failure(vcpu, vmcs12, ret, exit_qual);
vmx->nested.nested_run_pending = 0;
@@ -12856,7 +12856,7 @@ static int nested_vmx_run(struct kvm_vcp
vmx->vcpu.arch.l1tf_flush_l1d = true;

/*
- * Must happen outside of enter_vmx_non_root_mode() as it will
+ * Must happen outside of nested_vmx_enter_non_root_mode() as it will
* also be used as part of restoring nVMX state for
* snapshot restore (migration).
*
@@ -14089,7 +14089,7 @@ static int vmx_pre_leave_smm(struct kvm_

if (vmx->nested.smm.guest_mode) {
vcpu->arch.hflags &= ~HF_SMM_MASK;
- ret = enter_vmx_non_root_mode(vcpu, NULL);
+ ret = nested_vmx_enter_non_root_mode(vcpu, NULL);
vcpu->arch.hflags |= HF_SMM_MASK;
if (ret)
return ret;
@@ -14300,7 +14300,7 @@ static int vmx_set_nested_state(struct k
return -EINVAL;

vmx->nested.dirty_vmcs12 = true;
- ret = enter_vmx_non_root_mode(vcpu, NULL);
+ ret = nested_vmx_enter_non_root_mode(vcpu, NULL);
if (ret)
return -EINVAL;