On Thu, Nov 15, 2018 at 12:45:49AM -0500, Krish Sadhukhan wrote:
> Re-name the functions check_vmentry_pre[post]reqs to
> nested_check_pre[post]reqs because these functions are used only in
The usual method for describing multiple entities is {one,two,three},
e.g. check_vmentry_{pre,post}reqs.
There's also a lot of redundant information in the changelog, maybe:
KVM: nVMX: Prepend "nested_" to check_vmentry_{pre,post}reqs()
... as they are only used in nested context.
> nested context.
>
> Signed-off-by: Krish Sadhukhan <krish.sadhukhan@xxxxxxxxxx>
> Reviewed-by: Liran Alon <liran.alon@xxxxxxxxxx>
> Reviewed-by: Mihai Carabas <mihai.carabas@xxxxxxxxxx>
> Reviewed-by: Mark Kanda <mark.kanda@xxxxxxxxxx>
> ---
> arch/x86/kvm/vmx.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index e665aa7..411fcd2 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -12380,7 +12380,7 @@ static int nested_vmx_check_nmi_controls(struct vmcs12 *vmcs12)
> return 0;
> }
>
> -static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
> +static int nested_check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
> {
> struct vcpu_vmx *vmx = to_vmx(vcpu);
>
> @@ -12542,7 +12542,7 @@ static int nested_vmx_check_vmcs_link_ptr(struct kvm_vcpu *vcpu,
> return r;
> }
>
> -static int check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
> +static int nested_check_vmentry_postreqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
> u32 *exit_qual)
> {
> bool ia32e;
> @@ -12746,7 +12746,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)
> goto out;
> }
>
> - ret = check_vmentry_prereqs(vcpu, vmcs12);
> + ret = nested_check_vmentry_prereqs(vcpu, vmcs12);
> if (ret) {
> nested_vmx_failValid(vcpu, ret);
> goto out;
> @@ -12761,7 +12761,7 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)
> */
> skip_emulated_instruction(vcpu);
>
> - ret = check_vmentry_postreqs(vcpu, vmcs12, &exit_qual);
> + ret = nested_check_vmentry_postreqs(vcpu, vmcs12, &exit_qual);
> if (ret) {
> nested_vmx_entry_failure(vcpu, vmcs12,
> EXIT_REASON_INVALID_STATE, exit_qual);
> @@ -14085,8 +14085,8 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu,
> return -EINVAL;
> }
>
> - if (check_vmentry_prereqs(vcpu, vmcs12) ||
> - check_vmentry_postreqs(vcpu, vmcs12, &exit_qual))
> + if (nested_check_vmentry_prereqs(vcpu, vmcs12) ||
> + nested_check_vmentry_postreqs(vcpu, vmcs12, &exit_qual))
> return -EINVAL;
>
> vmx->nested.dirty_vmcs12 = true;
> --
> 2.9.5
>
