[Xen-changelog] [xen-unstable] xen: make need_iommu == 0 if !HAS_PASSTHROUGH

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1329308659 0
# Node ID 32e049f49b873ee7c0c1ed6c72390706f92b851c
# Parent  6ed7fdb587afd1fd6f724032cf7040041369f819
xen: make need_iommu == 0 if !HAS_PASSTHROUGH

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: keir@xxxxxxx
Committed-by: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
---


diff -r 6ed7fdb587af -r 32e049f49b87 xen/Rules.mk
--- a/xen/Rules.mk      Wed Feb 15 12:24:19 2012 +0000
+++ b/xen/Rules.mk      Wed Feb 15 12:24:19 2012 +0000
@@ -51,6 +51,7 @@
 CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
 CFLAGS-$(HAS_ACPI)      += -DHAS_ACPI
+CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH
 CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER
 
 ifneq ($(max_phys_cpus),)
diff -r 6ed7fdb587af -r 32e049f49b87 xen/arch/arm/dummy.S
--- a/xen/arch/arm/dummy.S      Wed Feb 15 12:24:19 2012 +0000
+++ b/xen/arch/arm/dummy.S      Wed Feb 15 12:24:19 2012 +0000
@@ -27,8 +27,6 @@
 DUMMY(gnttab_clear_flag);
 DUMMY(gnttab_mark_dirty);
 DUMMY(hypercall_create_continuation);
-DUMMY(iommu_map_page);
-DUMMY(iommu_unmap_page);
 DUMMY(is_iomem_page);
 DUMMY(max_page);
 DUMMY(node_online_map);
diff -r 6ed7fdb587af -r 32e049f49b87 xen/include/xen/sched.h
--- a/xen/include/xen/sched.h   Wed Feb 15 12:24:19 2012 +0000
+++ b/xen/include/xen/sched.h   Wed Feb 15 12:24:19 2012 +0000
@@ -266,8 +266,10 @@
 
     /* Is this an HVM guest? */
     bool_t           is_hvm;
+#ifdef HAS_PASSTHROUGH
     /* Does this guest need iommu mappings? */
     bool_t           need_iommu;
+#endif
     /* Is this guest fully privileged (aka dom0)? */
     bool_t           is_privileged;
     /* Which guest this guest has privileges on */
@@ -687,7 +689,11 @@
 #define is_hvm_vcpu(v)   (is_hvm_domain(v->domain))
 #define is_pinned_vcpu(v) ((v)->domain->is_pinned || \
                            cpumask_weight((v)->cpu_affinity) == 1)
+#ifdef HAS_PASSTHROUGH
 #define need_iommu(d)    ((d)->need_iommu)
+#else
+#define need_iommu(d)    (0)
+#endif
 
 void set_vcpu_migration_delay(unsigned int delay);
 unsigned int get_vcpu_migration_delay(void);

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