Commit 92e82cf6 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Sean Christopherson
Browse files

KVM: x86: Introduce __kvm_get_hypervisor_cpuid() helper 



Similar to kvm_find_kvm_cpuid_features()/__kvm_find_kvm_cpuid_features(),
introduce a helper to search for the specific hypervisor signature in any
struct kvm_cpuid_entry2 array, not only in vcpu->arch.cpuid_entries.

No functional change intended.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Link: https://lore.kernel.org/r/20240228101837.93642-2-vkuznets@redhat.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 41bccc98

arch/x86/kvm/cpuid.c

+10 −3
Original line number Diff line number Diff line
@@ -189,15 +189,15 @@ static int kvm_cpuid_check_equal(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 
	return 0;

}



static struct kvm_hypervisor_cpuid kvm_get_hypervisor_cpuid(struct kvm_vcpu *vcpu,

							    const char *sig)

static struct kvm_hypervisor_cpuid __kvm_get_hypervisor_cpuid(struct kvm_cpuid_entry2 *entries,

							      int nent, const char *sig)

{

	struct kvm_hypervisor_cpuid cpuid = {};

	struct kvm_cpuid_entry2 *entry;

	u32 base;



	for_each_possible_hypervisor_cpuid_base(base) {

		entry = kvm_find_cpuid_entry(vcpu, base);

		entry = cpuid_entry2_find(entries, nent, base, KVM_CPUID_INDEX_NOT_SIGNIFICANT);



		if (entry) {

			u32 signature[3];
@@ -217,6 +217,13 @@ static struct kvm_hypervisor_cpuid kvm_get_hypervisor_cpuid(struct kvm_vcpu *vcp 
	return cpuid;

}



static struct kvm_hypervisor_cpuid kvm_get_hypervisor_cpuid(struct kvm_vcpu *vcpu,

							    const char *sig)

{

	return __kvm_get_hypervisor_cpuid(vcpu->arch.cpuid_entries,

					  vcpu->arch.cpuid_nent, sig);

}



static struct kvm_cpuid_entry2 *__kvm_find_kvm_cpuid_features(struct kvm_vcpu *vcpu,

					      struct kvm_cpuid_entry2 *entries, int nent)

{