| Message ID | 20180828160459.14093-8-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 |
On Tue, Aug 28, 2018 at 9:04 AM, Sean Christopherson <sean.j.christopherson@intel.com> wrote: > ...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>
On 08/28/2018 09:04 AM, Sean Christopherson wrote: > ...to be more consistent with the nested VMX nomenclature. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > --- > arch/x86/kvm/vmx.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index e58dd3a66abf..5fe44462f713 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -12550,7 +12550,7 @@ static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, > * 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); > @@ -12694,7 +12694,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) > */ > > 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; > @@ -12705,7 +12705,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) > 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). > * > @@ -13816,7 +13816,7 @@ static int vmx_pre_leave_smm(struct kvm_vcpu *vcpu, u64 smbase) > > 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; > @@ -14017,7 +14017,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu, > vmx->nested.nested_run_pending = 1; > > 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; > Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index e58dd3a66abf..5fe44462f713 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -12550,7 +12550,7 @@ static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, * 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); @@ -12694,7 +12694,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) */ 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; @@ -12705,7 +12705,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) 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). * @@ -13816,7 +13816,7 @@ static int vmx_pre_leave_smm(struct kvm_vcpu *vcpu, u64 smbase) 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; @@ -14017,7 +14017,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu, vmx->nested.nested_run_pending = 1; 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;
...to be more consistent with the nested VMX nomenclature. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kvm/vmx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)