[PATCH 35/42] KVM: selftests: Drop unnecessary use of kvm_get_supported_cpuid_index()

From: Sean Christopherson
Date: Fri Jun 03 2022 - 21:24:29 EST


Use kvm_get_supported_cpuid_entry() instead of
kvm_get_supported_cpuid_index() when passing in '0' for the index, which
just so happens to be the case in all remaining users of
kvm_get_supported_cpuid_index() except kvm_get_supported_cpuid_entry().

Keep the helper as there may be users in the future, and it's not doing
any harm.

Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
tools/testing/selftests/kvm/x86_64/amx_test.c | 2 +-
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c | 4 ++--
tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/kvm/x86_64/amx_test.c b/tools/testing/selftests/kvm/x86_64/amx_test.c
index a886c9e81b87..411a33cd4296 100644
--- a/tools/testing/selftests/kvm/x86_64/amx_test.c
+++ b/tools/testing/selftests/kvm/x86_64/amx_test.c
@@ -318,7 +318,7 @@ int main(int argc, char *argv[])
TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XTILEDATA));

/* Get xsave/restore max size */
- xsave_restore_size = kvm_get_supported_cpuid_index(0xd, 0)->ecx;
+ xsave_restore_size = kvm_get_supported_cpuid_entry(0xd)->ecx;

run = vcpu->run;
vcpu_regs_get(vcpu, &regs1);
diff --git a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
index 5321bfe8b4e9..af018af2d54d 100644
--- a/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
+++ b/tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c
@@ -376,7 +376,7 @@ static bool use_intel_pmu(void)
{
const struct kvm_cpuid_entry2 *entry;

- entry = kvm_get_supported_cpuid_index(0xa, 0);
+ entry = kvm_get_supported_cpuid_entry(0xa);
return is_intel_cpu() && check_intel_pmu_leaf(entry);
}

@@ -408,7 +408,7 @@ static bool use_amd_pmu(void)
{
const struct kvm_cpuid_entry2 *entry;

- entry = kvm_get_supported_cpuid_index(1, 0);
+ entry = kvm_get_supported_cpuid_entry(1);
return is_amd_cpu() &&
(is_zen1(entry->eax) ||
is_zen2(entry->eax) ||
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c b/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c
index 689517f2aae6..6ec901dab61e 100644
--- a/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_PDCM));

TEST_REQUIRE(kvm_get_cpuid_max_basic() >= 0xa);
- entry_a_0 = kvm_get_supported_cpuid_index(0xa, 0);
+ entry_a_0 = kvm_get_supported_cpuid_entry(0xa);

eax.full = entry_a_0->eax;
__TEST_REQUIRE(eax.split.version_id, "PMU is not supported by the vCPU");
--
2.36.1.255.ge46751e96f-goog