Xen project Mailing List

[Xen-devel] [PATCH v24 15/15] x86/VPMU: Move VPMU files up from hvm/ directory

Since PMU is now not HVM specific we can move VPMU-related files up from arch/x86/hvm/ directory. Specifically: arch/x86/hvm/vpmu.c -> arch/x86/cpu/vpmu.c arch/x86/hvm/svm/vpmu.c -> arch/x86/cpu/vpmu_amd.c arch/x86/hvm/vmx/vpmu_core2.c -> arch/x86/cpu/vpmu_intel.c include/asm-x86/hvm/vpmu.h -> include/asm-x86/vpmu.h Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx> Acked-by: Jan Beulich <jbeulich@xxxxxxxx> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> Reviewed-by: Dietmar Hahn <dietmar.hahn@xxxxxxxxxxxxxx> Tested-by: Dietmar Hahn <dietmar.hahn@xxxxxxxxxxxxxx> --- xen/arch/x86/cpu/Makefile | 1 + xen/arch/x86/{hvm => cpu}/vpmu.c | 2 +- xen/arch/x86/{hvm/svm/vpmu.c => cpu/vpmu_amd.c} | 2 +- xen/arch/x86/{hvm/vmx/vpmu_core2.c => cpu/vpmu_intel.c} | 2 +- xen/arch/x86/hvm/Makefile | 1 - xen/arch/x86/hvm/svm/Makefile | 1 - xen/arch/x86/hvm/vlapic.c | 2 +- xen/arch/x86/hvm/vmx/Makefile | 1 - xen/arch/x86/oprofile/op_model_ppro.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/include/asm-x86/hvm/vmx/vmcs.h | 2 +- xen/include/asm-x86/{hvm => }/vpmu.h | 0 12 files changed, 8 insertions(+), 10 deletions(-) rename xen/arch/x86/{hvm => cpu}/vpmu.c (99%) rename xen/arch/x86/{hvm/svm/vpmu.c => cpu/vpmu_amd.c} (99%) rename xen/arch/x86/{hvm/vmx/vpmu_core2.c => cpu/vpmu_intel.c} (99%) rename xen/include/asm-x86/{hvm => }/vpmu.h (100%) diff --git a/xen/arch/x86/cpu/Makefile b/xen/arch/x86/cpu/Makefile index d73d93a..74f23ae 100644 --- a/xen/arch/x86/cpu/Makefile +++ b/xen/arch/x86/cpu/Makefile @@ -7,3 +7,4 @@ obj-y += common.o obj-y += intel.o obj-y += intel_cacheinfo.o obj-y += mwait-idle.o +obj-y += vpmu.o vpmu_amd.o vpmu_intel.o diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/cpu/vpmu.c similarity index 99% rename from xen/arch/x86/hvm/vpmu.c rename to xen/arch/x86/cpu/vpmu.c index 0eda20a..7137033 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -28,10 +28,10 @@ #include <asm/msr.h> #include <asm/nmi.h> #include <asm/p2m.h> +#include <asm/vpmu.h> #include <asm/hvm/support.h> #include <asm/hvm/vmx/vmx.h> #include <asm/hvm/vmx/vmcs.h> -#include <asm/hvm/vpmu.h> #include <asm/hvm/svm/svm.h> #include <asm/hvm/svm/vmcb.h> #include <asm/apic.h> diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/cpu/vpmu_amd.c similarity index 99% rename from xen/arch/x86/hvm/svm/vpmu.c rename to xen/arch/x86/cpu/vpmu_amd.c index b93d31d..759cd06 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -28,8 +28,8 @@ #include <xen/sched.h> #include <xen/irq.h> #include <asm/apic.h> +#include <asm/vpmu.h> #include <asm/hvm/vlapic.h> -#include <asm/hvm/vpmu.h> #include <public/pmu.h> #define MSR_F10H_EVNTSEL_GO_SHIFT 40 diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/cpu/vpmu_intel.c similarity index 99% rename from xen/arch/x86/hvm/vmx/vpmu_core2.c rename to xen/arch/x86/cpu/vpmu_intel.c index 1206e90..423ca82 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -30,6 +30,7 @@ #include <asm/traps.h> #include <asm/msr.h> #include <asm/msr-index.h> +#include <asm/vpmu.h> #include <asm/hvm/support.h> #include <asm/hvm/vlapic.h> #include <asm/hvm/vmx/vmx.h> @@ -37,7 +38,6 @@ #include <public/sched.h> #include <public/hvm/save.h> #include <public/pmu.h> -#include <asm/hvm/vpmu.h> /* * See Intel SDM Vol 2a Instruction Set Reference chapter 3 for CPUID diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index 69af47f..794e793 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -23,4 +23,3 @@ obj-y += vlapic.o obj-y += vmsi.o obj-y += vpic.o obj-y += vpt.o -obj-y += vpmu.o diff --git a/xen/arch/x86/hvm/svm/Makefile b/xen/arch/x86/hvm/svm/Makefile index a10a55e..760d295 100644 --- a/xen/arch/x86/hvm/svm/Makefile +++ b/xen/arch/x86/hvm/svm/Makefile @@ -6,4 +6,3 @@ obj-y += nestedsvm.o obj-y += svm.o obj-y += svmdebug.o obj-y += vmcb.o -obj-y += vpmu.o diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 92b0fa8..e03d670 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -33,12 +33,12 @@ #include <asm/page.h> #include <asm/apic.h> #include <asm/io_apic.h> +#include <asm/vpmu.h> #include <asm/hvm/hvm.h> #include <asm/hvm/io.h> #include <asm/hvm/support.h> #include <asm/hvm/vmx/vmx.h> #include <asm/hvm/nestedhvm.h> -#include <asm/hvm/vpmu.h> #include <public/hvm/ioreq.h> #include <public/hvm/params.h> diff --git a/xen/arch/x86/hvm/vmx/Makefile b/xen/arch/x86/hvm/vmx/Makefile index 373b3d9..04a29ce 100644 --- a/xen/arch/x86/hvm/vmx/Makefile +++ b/xen/arch/x86/hvm/vmx/Makefile @@ -3,5 +3,4 @@ obj-y += intr.o obj-y += realmode.o obj-y += vmcs.o obj-y += vmx.o -obj-y += vpmu_core2.o obj-y += vvmx.o diff --git a/xen/arch/x86/oprofile/op_model_ppro.c b/xen/arch/x86/oprofile/op_model_ppro.c index ca429a1..89649d0 100644 --- a/xen/arch/x86/oprofile/op_model_ppro.c +++ b/xen/arch/x86/oprofile/op_model_ppro.c @@ -19,7 +19,7 @@ #include <asm/processor.h> #include <asm/regs.h> #include <asm/current.h> -#include <asm/hvm/vpmu.h> +#include <asm/vpmu.h> #include "op_x86_model.h" #include "op_counter.h" diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4a79931..46ea81b 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -72,7 +72,7 @@ #include <asm/apic.h> #include <asm/mc146818rtc.h> #include <asm/hpet.h> -#include <asm/hvm/vpmu.h> +#include <asm/vpmu.h> #include <public/arch-x86/cpuid.h> #include <xsm/xsm.h> diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 1104bda..3132644 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -19,8 +19,8 @@ #ifndef __ASM_X86_HVM_VMX_VMCS_H__ #define __ASM_X86_HVM_VMX_VMCS_H__ +#include <asm/vpmu.h> #include <asm/hvm/io.h> -#include <asm/hvm/vpmu.h> #include <irq_vectors.h> extern void vmcs_dump_vcpu(struct vcpu *v); diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/vpmu.h similarity index 100% rename from xen/include/asm-x86/hvm/vpmu.h rename to xen/include/asm-x86/vpmu.h -- 1.8.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.