[Xen-changelog] [xen-unstable] Deinitialize timers before destroying the local apic; this protects us

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Steven Hand <steven@xxxxxxxxxxxxx>
# Date 1182858037 -3600
# Node ID 9261686d840c3d88519db70d325bd7589a90c855
# Parent  3f76b2f76c2ad605c448a5535780a17cbefd0b05
Deinitialize timers before destroying the local apic; this protects us
against a late firing timer callback function (e.g. hpet_timer_fn) which
tries to access local APIC state.

Signed-off-by: Steven Hand <steven@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/hvm.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff -r 3f76b2f76c2a -r 9261686d840c xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Mon Jun 25 16:52:39 2007 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Tue Jun 26 12:40:37 2007 +0100
@@ -423,12 +423,6 @@ void hvm_vcpu_destroy(struct vcpu *v)
 {
     struct domain *d = v->domain;
 
-    vlapic_destroy(v);
-    hvm_funcs.vcpu_destroy(v);
-
-    /* Event channel is already freed by evtchn_destroy(). */
-    /*free_xen_event_channel(v, v->arch.hvm_vcpu.xen_port);*/
-
     if ( v->vcpu_id == 0 )
     {
         /* NB. All these really belong in hvm_domain_destroy(). */
@@ -437,6 +431,12 @@ void hvm_vcpu_destroy(struct vcpu *v)
         pmtimer_deinit(d);
         hpet_deinit(d);
     }
+
+    vlapic_destroy(v);
+    hvm_funcs.vcpu_destroy(v);
+
+    /* Event channel is already freed by evtchn_destroy(). */
+    /*free_xen_event_channel(v, v->arch.hvm_vcpu.xen_port);*/
 }
 
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog