Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1262950773 0
# Node ID f909045c2284d4e96a133a3c0ceff73f554aa8ae
# Parent 0db36bfd1986318fccefa15d78e7fd6534be8aa7
VT-d: get rid of trailing whitespace

Signed-off-by: Weidong Han <weidong.han@intel.com>
---
xen/drivers/passthrough/io.c | 6 +++---
xen/drivers/passthrough/vtd/ia64/ats.c | 2 +-
xen/drivers/passthrough/vtd/iommu.c | 4 ++--
xen/drivers/passthrough/vtd/utils.c | 2 +-
xen/drivers/passthrough/vtd/vtd.h | 2 +-
xen/drivers/passthrough/vtd/x86/ats.c | 8 ++++----
xen/drivers/passthrough/vtd/x86/vtd.c | 6 +++---
xen/include/asm-x86/hvm/iommu.h | 2 +-
xen/include/xen/iommu.h | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)

diff -r 0db36bfd1986 -r f909045c2284 xen/drivers/passthrough/io.c
--- a/xen/drivers/passthrough/io.c Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/drivers/passthrough/io.c Fri Jan 08 11:39:33 2010 +0000
@@ -116,7 +116,7 @@ int pt_irq_create_bind_vtd(
return -ENOMEM;
}
memset(hvm_irq_dpci, 0, sizeof(*hvm_irq_dpci));
- tasklet_init(&hvm_irq_dpci->dirq_tasklet,
+ tasklet_init(&hvm_irq_dpci->dirq_tasklet,
hvm_dirq_assist, (unsigned long)d);
hvm_irq_dpci->mirq = xmalloc_array(struct hvm_mirq_dpci_mapping,
d->nr_pirqs);
@@ -138,7 +138,7 @@ int pt_irq_create_bind_vtd(
d->nr_pirqs * sizeof(*hvm_irq_dpci->mirq));
bitmap_zero(hvm_irq_dpci->dirq_mask, d->nr_pirqs);
bitmap_zero(hvm_irq_dpci->mapping, d->nr_pirqs);
- memset(hvm_irq_dpci->hvm_timer, 0,
+ memset(hvm_irq_dpci->hvm_timer, 0,
nr_irqs * sizeof(*hvm_irq_dpci->hvm_timer));
for ( int i = 0; i < d->nr_pirqs; i++ ) {
INIT_LIST_HEAD(&hvm_irq_dpci->mirq[i].digl_list);
@@ -197,7 +197,7 @@ int pt_irq_create_bind_vtd(
spin_unlock(&d->event_lock);
return -EBUSY;
}
-
+
/* if pirq is already mapped as vmsi, update the guest data/addr */
if ( hvm_irq_dpci->mirq[pirq].gmsi.gvec != pt_irq_bind->u.msi.gvec ||
hvm_irq_dpci->mirq[pirq].gmsi.gflags != pt_irq_bind->u.msi.gflags) {
diff -r 0db36bfd1986 -r f909045c2284 xen/drivers/passthrough/vtd/ia64/ats.c
--- a/xen/drivers/passthrough/vtd/ia64/ats.c Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/drivers/passthrough/vtd/ia64/ats.c Fri Jan 08 11:39:33 2010 +0000
@@ -45,7 +45,7 @@ int enable_ats_device(int seg, int bus,
int enable_ats_device(int seg, int bus, int devfn)
{
return 0;
-}
+}

int dev_invalidate_iotlb(struct iommu *iommu, u16 did,
u64 addr, unsigned int size_order, u64 type)
diff -r 0db36bfd1986 -r f909045c2284 xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/drivers/passthrough/vtd/iommu.c Fri Jan 08 11:39:33 2010 +0000
@@ -959,7 +959,7 @@ static void dma_msi_set_affinity(unsigne
/* Follow MSI setting */
if (x2apic_enabled)
msg.address_hi = dest & 0xFFFFFF00;
- msg.address_lo = (MSI_ADDRESS_HEADER << (MSI_ADDRESS_HEADER_SHIFT + 8));
+ msg.address_lo = (MSI_ADDRESS_HEADER << (MSI_ADDRESS_HEADER_SHIFT + 8));
msg.address_lo |= INT_DEST_MODE ? MSI_ADDR_DESTMODE_LOGIC:
MSI_ADDR_DESTMODE_PHYS;
msg.address_lo |= (INT_DELIVERY_MODE != dest_LowestPrio) ?
@@ -1008,7 +1008,7 @@ static int iommu_set_interrupt(struct io

irq_desc[irq].handler = &dma_msi_type;
irq_to_iommu[irq] = iommu;
-#ifdef CONFIG_X86
+#ifdef CONFIG_X86
ret = request_irq(irq, iommu_page_fault, 0, "dmar", iommu);
#else
ret = request_irq_vector(irq, iommu_page_fault, 0, "dmar", iommu);
diff -r 0db36bfd1986 -r f909045c2284 xen/drivers/passthrough/vtd/utils.c
--- a/xen/drivers/passthrough/vtd/utils.c Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/drivers/passthrough/vtd/utils.c Fri Jan 08 11:39:33 2010 +0000
@@ -126,7 +126,7 @@ void print_vtd_entries(struct iommu *iom
}

root_entry = (struct root_entry *)map_vtd_domain_page(iommu->root_maddr);
-
+
printk(" root_entry = %p\n", root_entry);
printk(" root_entry[%x] = %"PRIx64"\n", bus, root_entry[bus].val);
if ( !root_present(root_entry[bus]) )
diff -r 0db36bfd1986 -r f909045c2284 xen/drivers/passthrough/vtd/vtd.h
--- a/xen/drivers/passthrough/vtd/vtd.h Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/drivers/passthrough/vtd/vtd.h Fri Jan 08 11:39:33 2010 +0000
@@ -37,7 +37,7 @@ struct IO_xAPIC_route_entry {
trigger : 1, /* 0: edge, 1: level */
mask : 1, /* 0: enabled, 1: disabled */
__reserved_2 : 15;
-
+
union {
struct { __u32
__reserved_1 : 24,
diff -r 0db36bfd1986 -r f909045c2284 xen/drivers/passthrough/vtd/x86/ats.c
--- a/xen/drivers/passthrough/vtd/x86/ats.c Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/drivers/passthrough/vtd/x86/ats.c Fri Jan 08 11:39:33 2010 +0000
@@ -150,7 +150,7 @@ int enable_ats_device(int seg, int bus,
list_add(&(pdev->list), &ats_devices);

return pos;
-}
+}

static int device_in_domain(struct iommu *iommu, struct pci_ats_dev *pdev, u16 did)
{
@@ -222,8 +222,8 @@ int dev_invalidate_iotlb(struct iommu *i
addr &= ~0 << (PAGE_SHIFT + size_order);

/* if size <= 4K, set sbit = 0, else set sbit = 1 */
- sbit = size_order ? 1 : 0;
-
+ sbit = size_order ? 1 : 0;
+
/* clear lower bits */
addr &= (~0 << (PAGE_SHIFT + size_order));

@@ -236,7 +236,7 @@ int dev_invalidate_iotlb(struct iommu *i
break;
default:
dprintk(XENLOG_WARNING VTDPREFIX, "invalid vt-d flush type\n");
- break;
+ break;
}
}
return ret;
diff -r 0db36bfd1986 -r f909045c2284 xen/drivers/passthrough/vtd/x86/vtd.c
--- a/xen/drivers/passthrough/vtd/x86/vtd.c Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/drivers/passthrough/vtd/x86/vtd.c Fri Jan 08 11:39:33 2010 +0000
@@ -142,10 +142,10 @@ void iommu_set_dom0_mapping(struct domai
for ( i = 0; i < max_pfn; i++ )
{
/*
- * Set up 1:1 mapping for dom0. Default to use only conventional RAM
- * areas and let RMRRs include needed reserved regions. When set, the
+ * Set up 1:1 mapping for dom0. Default to use only conventional RAM
+ * areas and let RMRRs include needed reserved regions. When set, the
* inclusive mapping maps in everything below 4GB except unusable
- * ranges.
+ * ranges.
*/
if ( !page_is_ram_type(i, RAM_TYPE_CONVENTIONAL) &&
(!iommu_inclusive_mapping ||
diff -r 0db36bfd1986 -r f909045c2284 xen/include/asm-x86/hvm/iommu.h
--- a/xen/include/asm-x86/hvm/iommu.h Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/include/asm-x86/hvm/iommu.h Fri Jan 08 11:39:33 2010 +0000
@@ -8,7 +8,7 @@ extern int amd_iov_detect(void);
extern int amd_iov_detect(void);

static inline const struct iommu_ops *iommu_get_ops(void)
-{
+{
switch ( boot_cpu_data.x86_vendor )
{
case X86_VENDOR_INTEL:
diff -r 0db36bfd1986 -r f909045c2284 xen/include/xen/iommu.h
--- a/xen/include/xen/iommu.h Fri Jan 08 11:39:06 2010 +0000
+++ b/xen/include/xen/iommu.h Fri Jan 08 11:39:33 2010 +0000
@@ -69,7 +69,7 @@ int device_assigned(u8 bus, u8 devfn);
int device_assigned(u8 bus, u8 devfn);
int assign_device(struct domain *d, u8 bus, u8 devfn);
int deassign_device(struct domain *d, u8 bus, u8 devfn);
-int iommu_get_device_group(struct domain *d, u8 bus, u8 devfn,
+int iommu_get_device_group(struct domain *d, u8 bus, u8 devfn,
XEN_GUEST_HANDLE_64(uint32) buf, int max_sdevs);
int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn);
int iommu_unmap_page(struct domain *d, unsigned long gfn);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog