aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-08-06 09:40:50 +0100
committerKeir Fraser <keir.fraser@citrix.com>2008-08-06 09:40:50 +0100
commit1c6f32e9fe7fe1fef00995673c3eeb88eeded538 (patch)
tree5cb298e24734db9dcc1d2c2d95de5b3559e0bbe4
parentbe408edf704b95cba05cfcfd58201474eeefdb7d (diff)
downloadxen-1c6f32e9fe7fe1fef00995673c3eeb88eeded538.tar.gz
xen-1c6f32e9fe7fe1fef00995673c3eeb88eeded538.tar.bz2
xen-1c6f32e9fe7fe1fef00995673c3eeb88eeded538.zip
vtd: Tiny cleanups.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-rw-r--r--xen/drivers/passthrough/vtd/iommu.c6
-rw-r--r--xen/include/xen/iommu.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 1895cb6081..d53140b7b0 100644
--- 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 71204d56de..d5c39b99ed 100644
--- 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