On Thu, 2023-05-11 at 16:33 -0700, Sean Christopherson wrote:
> Make kvm_mtrr_valid() local to mtrr.c now that it's not used to check the
> validity of a PAT MSR value.
>
> Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
Reviewed-by: Kai Huang <kai.huang@xxxxxxxxx>
Nit: looks this patch can be moved to right after patch 2 (KVM: SVM: Use
kvm_pat_valid() directly instead of kvm_mtrr_valid()), as after that one it
seems there is no other caller outside of mtrr.c.
> ---
> arch/x86/kvm/mtrr.c | 3 +--
> arch/x86/kvm/x86.h | 1 -
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c
> index cdbbb511f940..3eb6e7f47e96 100644
> --- a/arch/x86/kvm/mtrr.c
> +++ b/arch/x86/kvm/mtrr.c
> @@ -65,7 +65,7 @@ static bool valid_mtrr_type(unsigned t)
> return t < 8 && (1 << t) & 0x73; /* 0, 1, 4, 5, 6 */
> }
>
> -bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data)
> +static bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data)
> {
> int i;
> u64 mask;
> @@ -100,7 +100,6 @@ bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data)
>
> return (data & mask) == 0;
> }
> -EXPORT_SYMBOL_GPL(kvm_mtrr_valid);
>
> static bool mtrr_is_enabled(struct kvm_mtrr *mtrr_state)
> {
> diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
> index c544602d07a3..82e3dafc5453 100644
> --- a/arch/x86/kvm/x86.h
> +++ b/arch/x86/kvm/x86.h
> @@ -309,7 +309,6 @@ void kvm_deliver_exception_payload(struct kvm_vcpu *vcpu,
>
> void kvm_vcpu_mtrr_init(struct kvm_vcpu *vcpu);
> u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
> -bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data);
> int kvm_mtrr_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data);
> int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata);
> bool kvm_mtrr_check_gfn_range_consistency(struct kvm_vcpu *vcpu, gfn_t gfn,
> --
> 2.40.1.606.ga4b1b128d6-goog
>
