aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDietmar Hahn <dietmar.hahn@ts.fujitsu.com>2011-08-31 15:26:45 +0100
committerDietmar Hahn <dietmar.hahn@ts.fujitsu.com>2011-08-31 15:26:45 +0100
commit97651dcab89625283d604671f98cbbc27ee5327e (patch)
treecbba9428dde392c9a9f094da9e957693c9b30f54
parent6036c6bde48783143287ec7606e75d293a2c5fa5 (diff)
downloadxen-97651dcab89625283d604671f98cbbc27ee5327e.tar.gz
xen-97651dcab89625283d604671f98cbbc27ee5327e.tar.bz2
xen-97651dcab89625283d604671f98cbbc27ee5327e.zip
vpmu: Add processors Westmere E7-8837 and SandyBridge i5-2500 to the vpmu list
Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com> xen-unstable changeset: 23803:51983821efa4 xen-unstable date: Wed Aug 31 15:17:45 2011 +0100
-rw-r--r--xen/arch/x86/hvm/vmx/vpmu_core2.c3
-rw-r--r--xen/arch/x86/hvm/vpmu.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c
index 44aa8e3c47..c9bee711fd 100644
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -56,7 +56,8 @@ static void check_pmc_quirk(void)
is_pmc_quirk = 0;
if ( family == 6 )
{
- if ( cpu_model == 46 || cpu_model == 26 )
+ if ( cpu_model == 47 || cpu_model == 46 || cpu_model == 42 ||
+ cpu_model == 26 )
is_pmc_quirk = 1;
}
}
diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c
index 657d2ff3b2..f1d2ebaeb9 100644
--- a/xen/arch/x86/hvm/vpmu.c
+++ b/xen/arch/x86/hvm/vpmu.c
@@ -120,7 +120,9 @@ void vpmu_initialise(struct vcpu *v)
case 23:
case 26:
case 29:
+ case 42:
case 46:
+ case 47:
vpmu->arch_vpmu_ops = &core2_vpmu_ops;
break;
}