From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 11 Jun 2008 15:38:02 +0000 (+0100)
Subject: MSI: Handle MSI EOI for amd systems
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14200^2~49
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=54530c47b569620152e7663487b28ef682040579;p=xen.git

MSI: Handle MSI EOI for amd systems
Signed-off-by: Wei Wang <wei.wang2@amd.com>
---

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index bb6b44d2e1..0790372be1 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -414,7 +414,7 @@ void vlapic_EOI_set(struct vlapic *vlapic)
     if ( vlapic_test_and_clear_vector(vector, &vlapic->regs->data[APIC_TMR]) )
         vioapic_update_EOI(vlapic_domain(vlapic), vector);
 	
-    if ( vtd_enabled )
+    if ( iommu_enabled )
         hvm_dpci_msi_eoi(current->domain, vector);
 }
 
diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c
index fc20aa0905..6d6ddd69df 100644
--- a/xen/drivers/passthrough/io.c
+++ b/xen/drivers/passthrough/io.c
@@ -216,7 +216,7 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector)
     struct hvm_irq_dpci *hvm_irq_dpci = d->arch.hvm_domain.irq.dpci;
     int pirq;
 
-    if ( !vtd_enabled || (hvm_irq_dpci == NULL) )
+    if ( !iommu_enabled || (hvm_irq_dpci == NULL) )
        return;
 
     pirq = hvm_irq_dpci->msi_gvec_pirq[vector];