aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/hvm/vpmu.c
diff options
context:
space:
mode:
authorDietmar Hahn <dietmar.hahn@ts.fujitsu.com>2012-02-29 13:51:42 +0000
committerDietmar Hahn <dietmar.hahn@ts.fujitsu.com>2012-02-29 13:51:42 +0000
commit9e459f88d10b7a81c9153542dc267c4560dcbcf1 (patch)
tree35b2b5cfc914cd1533d7ec3e6d99de3e889fcb15 /xen/arch/x86/hvm/vpmu.c
parentf3ff1b2db447cf9fbe5005faf0f20ab911661863 (diff)
downloadxen-9e459f88d10b7a81c9153542dc267c4560dcbcf1.tar.gz
xen-9e459f88d10b7a81c9153542dc267c4560dcbcf1.tar.bz2
xen-9e459f88d10b7a81c9153542dc267c4560dcbcf1.zip
vpmu: No need for two initialisation functions
With the changeset 24529:87854d3bed93 we got 2 initialisation functions for the arch specific stuff. This is no more needed. Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com> Committed-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/hvm/vpmu.c')
-rw-r--r--xen/arch/x86/hvm/vpmu.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c
index 1c52aad9c6..ed1353266c 100644
--- a/xen/arch/x86/hvm/vpmu.c
+++ b/xen/arch/x86/hvm/vpmu.c
@@ -88,6 +88,8 @@ void vpmu_initialise(struct vcpu *v)
if ( vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) )
vpmu_destroy(v);
+ vpmu_clear(vpmu);
+ vpmu->context = NULL;
switch ( vendor )
{
@@ -107,13 +109,6 @@ void vpmu_initialise(struct vcpu *v)
opt_vpmu_enabled = 0;
break;
}
-
- if ( vpmu->arch_vpmu_ops != NULL )
- {
- vpmu_clear(vpmu);
- vpmu->context = NULL;
- vpmu->arch_vpmu_ops->arch_vpmu_initialise(v);
- }
}
void vpmu_destroy(struct vcpu *v)