Make the xen-iommu work only on PV guests.

On initial domains (dom0) the Xen-SWIOTLB will be used instead.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/drivers/pci/xen-iommu.c b/drivers/pci/xen-iommu.c
index 5b7ef535588b10efe58923f89ae2361645aca29a..9ba63b1b96884c08464b47d88a954a4aa5c01eba 100644 (file)
--- a/drivers/pci/xen-iommu.c
+++ b/drivers/pci/xen-iommu.c
@@ -260,6 +260,9 @@ void __init xen_iommu_init(void)
        if (!xen_pv_domain())
                return;
 
+       if (xen_initial_domain()) /* For dom0, the IOMMU is handled by arch/x86/xen/pci-swiotlb.c. */
+               return;
+
        printk(KERN_INFO "Xen: Initializing Xen DMA ops\n");
 
        force_iommu = 0;