diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2012-02-15 12:24:19 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2012-02-15 12:24:19 +0000 |
| commit | 7214bd45fac72a1d74eac51109bf1d27f65c326b (patch) | |
| tree | 052bf96221363597b068beb4d34de1cec606e5bd | |
| parent | 7cfc339cbc2f36b603c32478a769456f3660e061 (diff) | |
| download | xen-7214bd45fac72a1d74eac51109bf1d27f65c326b.tar.gz xen-7214bd45fac72a1d74eac51109bf1d27f65c326b.tar.bz2 xen-7214bd45fac72a1d74eac51109bf1d27f65c326b.zip | |
xen: make need_iommu == 0 if !HAS_PASSTHROUGH
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: keir@xen.org
Committed-by: Ian Campbell <Ian.Campbell@citrix.com>
| -rw-r--r-- | xen/Rules.mk | 1 | ||||
| -rw-r--r-- | xen/arch/arm/dummy.S | 2 | ||||
| -rw-r--r-- | xen/include/xen/sched.h | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/xen/Rules.mk b/xen/Rules.mk index ee54179757..6123835ec1 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -51,6 +51,7 @@ CFLAGS-$(perfc) += -DPERF_COUNTERS 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 --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S index 5010619938..e858613565 100644 --- a/xen/arch/arm/dummy.S +++ b/xen/arch/arm/dummy.S @@ -27,8 +27,6 @@ DUMMY(gmfn_to_mfn); 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 --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 567cd363a7..3699929096 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -266,8 +266,10 @@ struct domain /* 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 @@ void watchdog_domain_destroy(struct domain *d); #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); |