From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 9 Apr 2008 15:32:51 +0000 (+0100)
Subject: x86 hvm: Make sure that we correctly tear down the vlapic periodic
X-Git-Tag: 3.3.0-rc1~243^2~36
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=24561bd0a1a9b183a58c0fa908ced751507bd1b2;p=xen.git

x86 hvm: Make sure that we correctly tear down the vlapic periodic
timer when the vlapic is destroyed or reset.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
---

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index d354440084..d66e3c26cf 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -789,6 +789,8 @@ void vlapic_reset(struct vlapic *vlapic)
 
     vlapic_set_reg(vlapic, APIC_SPIV, 0xff);
     vlapic->hw.disabled |= VLAPIC_SW_DISABLED;
+
+    destroy_periodic_time(&vlapic->pt);
 }
 
 /* rearm the actimer if needed, after a HVM restore */