Re: [PATCH 6/7] KVM: x86: Rename APIC base setters to better capture their relationship

[Paolo Bonzini]

On 10/9/24 20:17, Sean Christopherson wrote:
> Rename kvm_set_apic_base() and kvm_lapic_set_base() to kvm_apic_set_base()
> and __kvm_apic_set_base() respectively to capture that the underscores
> version is a "special" variant (it exists purely to avoid recalculating
> the optimized map multiple times when stuffing the RESET value).
>
> No functional change intended.
>
> Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
> ---
>   arch/x86/kvm/lapic.c | 8 ++++----
>   arch/x86/kvm/lapic.h | 3 +--
>   arch/x86/kvm/x86.c   | 4 ++--
>   3 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index 6239cfd89aad..0a73d9a09fe0 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -2577,7 +2577,7 @@ u64 kvm_lapic_get_cr8(struct kvm_vcpu *vcpu)
>   	return (tpr & 0xf0) >> 4;
>   }
>   
> -void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
> +static void __kvm_apic_set_base(struct kvm_vcpu *vcpu, u64 value)
>   {
>   	u64 old_value = vcpu->arch.apic_base;
>   	struct kvm_lapic *apic = vcpu->arch.apic;
> @@ -2628,7 +2628,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
>   	}
>   }
>   
> -int kvm_set_apic_base(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
> +int kvm_apic_set_base(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
>   {
>   	enum lapic_mode old_mode = kvm_get_apic_mode(vcpu);
>   	enum lapic_mode new_mode = kvm_apic_mode(msr_info->data);
> @@ -2644,7 +2644,7 @@ int kvm_set_apic_base(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
>   			return 1;
>   	}
>   
> -	kvm_lapic_set_base(vcpu, msr_info->data);
> +	__kvm_apic_set_base(vcpu, msr_info->data);
>   	kvm_recalculate_apic_map(vcpu->kvm);
>   	return 0;
>   }
> @@ -2752,7 +2752,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event)
>   		msr_val = APIC_DEFAULT_PHYS_BASE | MSR_IA32_APICBASE_ENABLE;
>   		if (kvm_vcpu_is_reset_bsp(vcpu))
>   			msr_val |= MSR_IA32_APICBASE_BSP;
> -		kvm_lapic_set_base(vcpu, msr_val);
> +		__kvm_apic_set_base(vcpu, msr_val);

Might be worth a comment here, otherwise

Reviewed-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>

for the entire series.

Paolo