From: Keir Fraser <keir@xensource.com>
Date: Fri, 26 Oct 2007 09:33:12 +0000 (+0100)
Subject: x86, hvm, vt-d: Kill timer in iommu domain destroy
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14828^2~35
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ad6a137c37508e9ea5372fb2ac4b509059853a7;p=xen.git

x86, hvm, vt-d: Kill timer in iommu domain destroy
Signed-off-by: Weidong Han <weidong.han@intel.com>
---

diff --git a/xen/arch/x86/hvm/vmx/vtd/io.c b/xen/arch/x86/hvm/vmx/vtd/io.c
index b5c5ed6df0..81cf1ae609 100644
--- a/xen/arch/x86/hvm/vmx/vtd/io.c
+++ b/xen/arch/x86/hvm/vmx/vtd/io.c
@@ -180,7 +180,10 @@ void iommu_domain_destroy(struct domain *d)
     {
         for ( i = 0; i < NR_IRQS; i++ )
             if ( hvm_irq_dpci->mirq[i].valid )
+            {
                 pirq_guest_unbind(d, i);
+                kill_timer(&hvm_irq_dpci->hvm_timer[irq_to_vector(i)]);
+            }
         d->arch.hvm_domain.irq.dpci = NULL;
         xfree(hvm_irq_dpci);
     }