vpmu: cleanup structures

- struct msr_load_store_entry is unused
- struct pmumsr is only used in the vmx part

Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
Committed-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c
index ba1bd9da24f05f16aeac8d19fd628e9994f00567..e0453e4af12447ad0c50b6d3be62229821534dff 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -112,6 +112,11 @@ u32 core2_ctrls_msr[] = {
     MSR_IA32_PEBS_ENABLE,
     MSR_IA32_DS_AREA};
 
+struct pmumsr {
+    unsigned int num;
+    u32 *msr;
+};
+
 struct pmumsr core2_counters = {
     3,
     core2_counters_msr

diff --git a/xen/include/asm-x86/hvm/vpmu.h b/xen/include/asm-x86/hvm/vpmu.h
index c08bc3b4e62c5ca0c641a0619e845165f0bf6e55..d6ed5f8e4dd09ab67636a16625f464e9c12dd66c 100644 (file)
--- a/xen/include/asm-x86/hvm/vpmu.h
+++ b/xen/include/asm-x86/hvm/vpmu.h
@@ -34,16 +34,6 @@
 #define MSR_TYPE_ARCH_COUNTER       3
 #define MSR_TYPE_ARCH_CTRL          4
 
-struct pmumsr {
-    unsigned int num;
-    u32 *msr;
-};
-
-struct msr_load_store_entry {
-    u32 msr_index;
-    u32 msr_reserved;
-    u64 msr_data;
-};
 
 /* Arch specific operations shared by all vpmus */
 struct arch_vpmu_ops {