vtd: Tiny cleanups.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>

diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 1895cb608146cecef5db512e7267fcbdd1a55f7c..d53140b7b05835bb0381d5d0ead6ba60fa5a56fa 100644 (file)
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -1270,13 +1270,15 @@ static int domain_context_mapping(struct domain *domain, u8 bus, u8 devfn)
         ob = bus; odf = devfn;
         if ( !find_pcie_endpoint(&bus, &devfn, &secbus) )
         {
-            gdprintk(XENLOG_WARNING VTDPREFIX, "domain_context_mapping:invalid");
+            gdprintk(XENLOG_WARNING VTDPREFIX,
+                     "domain_context_mapping:invalid\n");
             break;
         }
 
         if ( ob != bus || odf != devfn )
             gdprintk(XENLOG_INFO VTDPREFIX,
-                     "domain_context_mapping:map:  bdf = %x:%x.%x -> %x:%x.%x\n",
+                     "domain_context_mapping:map:  "
+                     "bdf = %x:%x.%x -> %x:%x.%x\n",
                      ob, PCI_SLOT(odf), PCI_FUNC(odf),
                      bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
 

diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index 71204d56dee956e78ea32ffcf6bbf58b5f6f34dd..d5c39b99ed0a031417d8af34d6c0f2ca6252a911 100644 (file)
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -33,7 +33,6 @@ extern int iommu_pv_enabled;
 extern int force_iommu;
 
 #define domain_hvm_iommu(d)     (&d->arch.hvm_domain.hvm_iommu)
-#define domain_vmx_iommu(d)     (&d->arch.hvm_domain.hvm_iommu.vmx_iommu)
 
 #define MAX_IOMMUS 32