The patch is only a small cleanup.
It replaces the special vpmu define LVTPC_HVM_PMU with the global
used define PMU_APIC_VECTOR to avoid different names for the
same thing.
Thanks.
Dietmar
Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
diff -r 3a71e070e3c5 -r d7b2984c934e xen/arch/x86/hvm/vmx/vpmu_core2.c
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c Fri Sep 18 14:45:40 2009 +0100
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c Mon Sep 21 08:01:54 2009 +0200
@@ -178,7 +178,7 @@
for ( i = 0; i < core2_get_pmc_count(); i++ )
rdmsrl(MSR_IA32_PERFCTR0+i,
core2_vpmu_cxt->arch_msr_pair[i].counter);
core2_vpmu_cxt->hw_lapic_lvtpc = apic_read(APIC_LVTPC);
- apic_write(APIC_LVTPC, LVTPC_HVM_PMU | APIC_LVT_MASKED);
+ apic_write(APIC_LVTPC, PMU_APIC_VECTOR | APIC_LVT_MASKED);
}
static void core2_vpmu_save(struct vcpu *v)
@@ -398,9 +398,9 @@
/* Setup LVTPC in local apic */
if ( vpmu->flags & VPMU_RUNNING &&
is_vlapic_lvtpc_enabled(vcpu_vlapic(v)) )
- apic_write_around(APIC_LVTPC, LVTPC_HVM_PMU);
+ apic_write_around(APIC_LVTPC, PMU_APIC_VECTOR);
else
- apic_write_around(APIC_LVTPC, LVTPC_HVM_PMU | APIC_LVT_MASKED);
+ apic_write_around(APIC_LVTPC, PMU_APIC_VECTOR | APIC_LVT_MASKED);
core2_vpmu_save_msr_context(v, type, index, msr_content);
if ( type != MSR_TYPE_GLOBAL )
diff -r 3a71e070e3c5 -r d7b2984c934e xen/include/asm-x86/hvm/vmx/vpmu.h
--- a/xen/include/asm-x86/hvm/vmx/vpmu.h Fri Sep 18 14:45:40 2009 +0100
+++ b/xen/include/asm-x86/hvm/vmx/vpmu.h Mon Sep 21 08:01:54 2009 +0200
@@ -34,8 +34,6 @@
#define MSR_TYPE_ARCH_COUNTER 3
#define MSR_TYPE_ARCH_CTRL 4
-#define LVTPC_HVM_PMU 0xf8
-
struct pmumsr {
unsigned int num;
u32 *msr;
--
Company details: http://ts.fujitsu.com/imprint.html
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel