Commit 43d62d10 authored by Like Xu's avatar Like Xu Committed by Paolo Bonzini
Browse files

KVM: x86/pmu: Move the vmx_icl_pebs_cpu[] definition out of the header file 



Defining a static const array in a header file would introduce redundant
definitions to the point of confusing semantics, and such a use case would
only bring complaints from the compiler:

arch/x86/kvm/pmu.h:20:32: warning: ‘vmx_icl_pebs_cpu’ defined but not used [-Wunused-const-variable=]
   20 | static const struct x86_cpu_id vmx_icl_pebs_cpu[] = {
      |                                ^~~~~~~~~~~~~~~~

Fixes: a095df2c5f48 ("KVM: x86/pmu: Adjust precise_ip to emulate Ice Lake guest PDIR counter")
Signed-off-by: default avatarLike Xu <likexu@tencent.com>
Message-Id: <20220518170118.66263-1-likexu@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5d9cd8b5

arch/x86/kvm/pmu.c

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/bsearch.h>

#include <linux/sort.h>

#include <asm/perf_event.h>

#include <asm/cpu_device_id.h>

#include "x86.h"

#include "cpuid.h"

#include "lapic.h"
@@ -27,6 +28,12 @@ 
struct x86_pmu_capability __read_mostly kvm_pmu_cap;

EXPORT_SYMBOL_GPL(kvm_pmu_cap);



static const struct x86_cpu_id vmx_icl_pebs_cpu[] = {

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL),

	{}

};



/* NOTE:

 * - Each perf counter is defined as "struct kvm_pmc";

 * - There are two types of perf counters: general purpose (gp) and fixed.

arch/x86/kvm/pmu.h

+0 −8
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 


#include <linux/nospec.h>



#include <asm/cpu_device_id.h>



#define vcpu_to_pmu(vcpu) (&(vcpu)->arch.pmu)

#define pmu_to_vcpu(pmu)  (container_of((pmu), struct kvm_vcpu, arch.pmu))

#define pmc_to_pmu(pmc)   (&(pmc)->vcpu->arch.pmu)
@@ -17,12 +15,6 @@ 
#define VMWARE_BACKDOOR_PMC_REAL_TIME		0x10001

#define VMWARE_BACKDOOR_PMC_APPARENT_TIME	0x10002



static const struct x86_cpu_id vmx_icl_pebs_cpu[] = {

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL),

	{}

};



struct kvm_event_hw_type_mapping {

	u8 eventsel;

	u8 unit_mask;