Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6bd1801 authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: x86: X86_FEATURE_NRIPS is not scattered anymore 



bit(X86_FEATURE_NRIPS) is 3 since 2ccd71f1 ("x86/cpufeature: Move
some of the scattered feature bits to x86_capability"), so we can
simplify the code.

Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 41ab9372

arch/x86/kvm/cpuid.h

+1 −13
Original line number Diff line number Diff line
@@ -160,25 +160,13 @@ static inline bool guest_cpuid_has_rdtscp(struct kvm_vcpu *vcpu) 
	return best && (best->edx & bit(X86_FEATURE_RDTSCP));

}



/*

 * NRIPS is provided through cpuidfn 0x8000000a.edx bit 3

 */

#define BIT_NRIPS	3



static inline bool guest_cpuid_has_nrips(struct kvm_vcpu *vcpu)

{

	struct kvm_cpuid_entry2 *best;



	best = kvm_find_cpuid_entry(vcpu, 0x8000000a, 0);



	/*

	 * NRIPS is a scattered cpuid feature, so we can't use

	 * X86_FEATURE_NRIPS here (X86_FEATURE_NRIPS would be bit

	 * position 8, not 3).

	 */

	return best && (best->edx & bit(BIT_NRIPS));

	return best && (best->edx & bit(X86_FEATURE_NRIPS));

}

#undef BIT_NRIPS



static inline int guest_cpuid_family(struct kvm_vcpu *vcpu)

{