From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keir Fraser Subject: Re: [PATCH 09/12] xen: make need_iommu == 0 if !HAS_PASSTHROUGH Date: Tue, 14 Feb 2012 18:33:13 +0000 Message-ID: References: <1329230641-18624-9-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1329230641-18624-9-git-send-email-ian.campbell@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Campbell , xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org On 14/02/2012 14:43, "Ian Campbell" wrote: > Signed-off-by: Ian Campbell Acked-by: Keir Fraser > Cc: keir@xen.org > --- > xen/Rules.mk | 1 + > xen/arch/arm/dummy.S | 2 -- > xen/include/xen/sched.h | 6 ++++++ > 3 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/xen/Rules.mk b/xen/Rules.mk > index ee54179..6123835 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 5010619..e858613 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 567cd36..3699929 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);