Commit a0f4ba7f authored Jan 19, 2022 by Jinrong Liang Committed by Paolo Bonzini Jan 20, 2022

selftests: kvm/x86: Fix the warning in pmu_event_filter_test.c



The following warning appears when executing
make -C tools/testing/selftests/kvm

x86_64/pmu_event_filter_test.c: In function 'vcpu_supports_intel_br_retired':
x86_64/pmu_event_filter_test.c:241:28: warning: variable 'cpuid' set but not used [-Wunused-but-set-variable]
  241 |         struct kvm_cpuid2 *cpuid;
      |                            ^~~~~
x86_64/pmu_event_filter_test.c: In function 'vcpu_supports_amd_zen_br_retired':
x86_64/pmu_event_filter_test.c:258:28: warning: variable 'cpuid' set but not used [-Wunused-but-set-variable]
  258 |         struct kvm_cpuid2 *cpuid;
      |                            ^~~~~

Just delete the unused variables to stay away from warnings.

Fixes: dc7e75b3b3ee ("selftests: kvm/x86: Add test for KVM_SET_PMU_EVENT_FILTER")
Signed-off-by: Jinrong Liang <cloudliang@tencent.com>
Message-Id: <20220119133910.56285-1-cloudliang@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 96c852c8

tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -347,9 +347,7 @@ static bool check_intel_pmu_leaf(struct kvm_cpuid_entry2 *entry)
		static bool use_intel_pmu(void)
		{
		struct kvm_cpuid_entry2 *entry;
		struct kvm_cpuid2 *cpuid;

		cpuid = kvm_get_supported_cpuid();
		entry = kvm_get_supported_cpuid_index(0xa, 0);
		return is_intel_cpu() && entry && check_intel_pmu_leaf(entry);
		}
		@@ -381,9 +379,7 @@ static bool is_zen3(uint32_t eax)
		static bool use_amd_pmu(void)
		{
		struct kvm_cpuid_entry2 *entry;
		struct kvm_cpuid2 *cpuid;

		cpuid = kvm_get_supported_cpuid();
		entry = kvm_get_supported_cpuid_index(1, 0);
		return is_amd_cpu() && entry &&
		(is_zen1(entry->eax) \|\|