On 5/14/2026 6:46 AM, Jim Mattson wrote:
> The function, supports_cpuid_fault(), tests specifically for guest support
> of Intel's CPUID faulting feature. It does not test for guest support of
> AMD's CPUID faulting feature.
>
> To avoid confusion, remove the helper.
>
> Signed-off-by: Jim Mattson <[email protected]>
Reviewed-by: Binbin Wu <[email protected]>
> ---
> arch/x86/kvm/cpuid.h | 5 -----
> arch/x86/kvm/x86.c | 2 +-
> 2 files changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h
> index bc4a8428b836..95d09ccbf951 100644
> --- a/arch/x86/kvm/cpuid.h
> +++ b/arch/x86/kvm/cpuid.h
> @@ -183,11 +183,6 @@ static inline int guest_cpuid_stepping(struct kvm_vcpu
> *vcpu)
> return x86_stepping(best->eax);
> }
>
> -static inline bool supports_cpuid_fault(struct kvm_vcpu *vcpu)
> -{
> - return vcpu->arch.msr_platform_info & MSR_PLATFORM_INFO_CPUID_FAULT;
> -}
> -
> static inline bool cpuid_fault_enabled(struct kvm_vcpu *vcpu)
> {
> return vcpu->arch.msr_misc_features_enables &
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 01c6b18d1fe5..c60773349f35 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -4252,7 +4252,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct
> msr_data *msr_info)
> case MSR_MISC_FEATURES_ENABLES:
> if (data & ~MSR_MISC_FEATURES_ENABLES_CPUID_FAULT ||
> (data & MSR_MISC_FEATURES_ENABLES_CPUID_FAULT &&
> - !supports_cpuid_fault(vcpu)))
> + !(vcpu->arch.msr_platform_info &
> MSR_PLATFORM_INFO_CPUID_FAULT)))
> return 1;
> vcpu->arch.msr_misc_features_enables = data;
> break;
