From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: [PATCH v10 20/20] x86/VPMU: Move VPMU files up from hvm/ directory Date: Wed, 3 Sep 2014 23:41:20 -0400 Message-ID: <1409802080-6160-21-git-send-email-boris.ostrovsky@oracle.com> References: <1409802080-6160-1-git-send-email-boris.ostrovsky@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1409802080-6160-1-git-send-email-boris.ostrovsky@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: jbeulich@suse.com, kevin.tian@intel.com, suravee.suthikulpanit@amd.com, eddie.dong@intel.com, Aravind.Gopalakrishnan@amd.com Cc: keir@xen.org, andrew.cooper3@citrix.com, tim@xen.org, xen-devel@lists.xen.org, jun.nakajima@intel.com, boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org 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/vpmu.c arch/x86/hvm/svm/vpmu.c -> arch/x86/vpmu_amd.c arch/x86/hvm/vmx/vpmu_core2.c -> arch/x86/vpmu_intel.c include/asm-x86/hvm/vpmu.h -> include/asm-x86/vpmu.h Signed-off-by: Boris Ostrovsky Acked-by: Kevin Tian Reviewed-by: Dietmar Hahn Tested-by: Dietmar Hahn --- xen/arch/x86/Makefile | 1 + 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/arch/x86/{hvm => }/vpmu.c | 2 +- xen/arch/x86/{hvm/svm/vpmu.c => vpmu_amd.c} | 2 +- xen/arch/x86/{hvm/vmx/vpmu_core2.c => vpmu_intel.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 => }/vpmu.c (99%) rename xen/arch/x86/{hvm/svm/vpmu.c => vpmu_amd.c} (99%) rename xen/arch/x86/{hvm/vmx/vpmu_core2.c => vpmu_intel.c} (99%) rename xen/include/asm-x86/{hvm => }/vpmu.h (100%) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c1e244d..e985cfc 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -59,6 +59,7 @@ obj-y += crash.o obj-y += tboot.o obj-y += hpet.o obj-y += xstate.o +obj-y += vpmu.o vpmu_amd.o vpmu_intel.o obj-$(crash_debug) += gdbstub.o diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index eea5555..742b83b 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -22,4 +22,3 @@ obj-y += vlapic.o obj-y += vmsi.o obj-y += vpic.o obj-y += vpt.o -obj-y += vpmu.o \ No newline at end of file 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 d72b0bd..2ed1117 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include 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 9e3510a..8f14d3e 100644 --- a/xen/arch/x86/oprofile/op_model_ppro.c +++ b/xen/arch/x86/oprofile/op_model_ppro.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "op_x86_model.h" #include "op_counter.h" diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index aaf8530..1869ecf 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include #include diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/vpmu.c similarity index 99% rename from xen/arch/x86/hvm/vpmu.c rename to xen/arch/x86/vpmu.c index 42ac53f..029773a 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/vpmu.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xen/arch/x86/hvm/svm/vpmu.c b/xen/arch/x86/vpmu_amd.c similarity index 99% rename from xen/arch/x86/hvm/svm/vpmu.c rename to xen/arch/x86/vpmu_amd.c index 9db0559..d2cff3f 100644 --- a/xen/arch/x86/hvm/svm/vpmu.c +++ b/xen/arch/x86/vpmu_amd.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #define MSR_F10H_EVNTSEL_GO_SHIFT 40 diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/vpmu_intel.c similarity index 99% rename from xen/arch/x86/hvm/vmx/vpmu_core2.c rename to xen/arch/x86/vpmu_intel.c index 10fd420..169abad 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/vpmu_intel.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include /* * See Intel SDM Vol 2a Instruction Set Reference chapter 3 for CPUID diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 6035f16..0a4452c 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -20,7 +20,7 @@ #define __ASM_X86_HVM_VMX_VMCS_H__ #include -#include +#include #include 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