[Xen-changelog] [xen-unstable] hvm: Destroy timers early during domain death.

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1182979217 -3600
# Node ID d0608ecb56bc9dd77740096fd734332c46c737bd
# Parent  3362de397f1e78d43edc0888d4500b4ae21b7af4
hvm: Destroy timers early during domain death.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/hvm.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff -r 3362de397f1e -r d0608ecb56bc xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Wed Jun 27 21:43:43 2007 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Wed Jun 27 22:20:17 2007 +0100
@@ -242,6 +242,11 @@ void hvm_domain_relinquish_resources(str
 {
     hvm_destroy_ioreq_page(d, &d->arch.hvm_domain.ioreq);
     hvm_destroy_ioreq_page(d, &d->arch.hvm_domain.buf_ioreq);
+
+    pit_deinit(d);
+    rtc_deinit(d);
+    pmtimer_deinit(d);
+    hpet_deinit(d);
 }
 
 void hvm_domain_destroy(struct domain *d)
@@ -421,17 +426,6 @@ int hvm_vcpu_initialise(struct vcpu *v)
 
 void hvm_vcpu_destroy(struct vcpu *v)
 {
-    struct domain *d = v->domain;
-
-    if ( v->vcpu_id == 0 )
-    {
-        /* NB. All these really belong in hvm_domain_destroy(). */
-        pit_deinit(d);
-        rtc_deinit(d);
-        pmtimer_deinit(d);
-        hpet_deinit(d);
-    }
-
     vlapic_destroy(v);
     hvm_funcs.vcpu_destroy(v);
 

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