Re: [PATCH] KVM: nVMX: Rename prepare_vmcs02_*_full to prepare_vmcs02_*_extra

[Sean Christopherson]

On Thu, Jun 06, 2019 at 05:24:12PM +0200, Paolo Bonzini wrote:
> These function do not prepare the entire state of the vmcs02, only the
> rarely needed parts.  Rename them to make this clearer.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> ---
>  arch/x86/kvm/vmx/nested.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
> index 84438cf23d37..fd8150ef6cce 100644
> --- a/arch/x86/kvm/vmx/nested.c
> +++ b/arch/x86/kvm/vmx/nested.c
> @@ -1955,7 +1955,7 @@ static void prepare_vmcs02_constant_state(struct vcpu_vmx *vmx)
>  	vmx_set_constant_host_state(vmx);
>  }
>  
> -static void prepare_vmcs02_early_full(struct vcpu_vmx *vmx,
> +static void prepare_vmcs02_early_extra(struct vcpu_vmx *vmx,

Or maybe 'uncommon', 'rare' or 'ext'?  I don't I particularly love any of
the names, but they're all better than 'full'.

Reviewed-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>

>  				      struct vmcs12 *vmcs12)
>  {
>  	prepare_vmcs02_constant_state(vmx);
> @@ -1976,7 +1976,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12)
>  	u64 guest_efer = nested_vmx_calc_efer(vmx, vmcs12);
>  
>  	if (vmx->nested.dirty_vmcs12 || vmx->nested.hv_evmcs)
> -		prepare_vmcs02_early_full(vmx, vmcs12);
> +		prepare_vmcs02_early_extra(vmx, vmcs12);
>  
>  	/*
>  	 * PIN CONTROLS
> @@ -2130,7 +2130,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12)
>  	}
>  }
>  
> -static void prepare_vmcs02_full(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12)
> +static void prepare_vmcs02_extra(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12)
>  {
>  	struct hv_enlightened_vmcs *hv_evmcs = vmx->nested.hv_evmcs;
>  
> @@ -2254,7 +2254,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
>  	struct vcpu_vmx *vmx = to_vmx(vcpu);
>  
>  	if (vmx->nested.dirty_vmcs12 || vmx->nested.hv_evmcs) {
> -		prepare_vmcs02_full(vmx, vmcs12);
> +		prepare_vmcs02_extra(vmx, vmcs12);
>  		vmx->nested.dirty_vmcs12 = false;
>  	}
>  
> -- 
> 1.8.3.1
>