From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xensource.com
Cc: keir@xen.org, Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 09/12] xen: make need_iommu == 0 if !HAS_PASSTHROUGH
Date: Tue, 14 Feb 2012 14:43:58 +0000 [thread overview]
Message-ID: <1329230641-18624-9-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1329230611.31256.248.camel@zakaz.uk.xensource.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
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);
--
1.7.2.5
next prev parent reply other threads:[~2012-02-14 14:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-14 14:43 [PATCH 00/12 v2] ARM: Slim down dummy.S Ian Campbell
2012-02-14 14:43 ` [PATCH 01/12] arm: add a missing local-vars comment Ian Campbell
2012-02-14 14:43 ` [PATCH 02/12] arm: define some more cp15 registers Ian Campbell
2012-02-14 14:43 ` [PATCH 03/12] arm: align some register bit definitions Ian Campbell
2012-02-14 14:43 ` [PATCH 04/12] arm: remove some unnecessary symbols from dummy.S Ian Campbell
2012-02-14 14:43 ` [PATCH 05/12] arm: Add stub functions instead of using DUMMY Ian Campbell
2012-02-14 14:43 ` [PATCH 06/12] PM: only include XEN_SYSCTL_{get_pmstat, pm_op} if HAVE_ACPI Ian Campbell
2012-02-14 18:32 ` Keir Fraser
2012-02-14 14:43 ` [PATCH 07/12] arm: provide dummy version of steal_page for tmem Ian Campbell
2012-02-14 14:43 ` [PATCH 08/12] arm: Implement arch_get_xen_caps Ian Campbell
2012-02-14 14:43 ` Ian Campbell [this message]
2012-02-14 18:33 ` [PATCH 09/12] xen: make need_iommu == 0 if !HAS_PASSTHROUGH Keir Fraser
2012-02-14 14:43 ` [PATCH 10/12] arm: stub out PoD related p2m functions Ian Campbell
2012-02-14 14:44 ` [PATCH 11/12] arm: define max_page Ian Campbell
2012-02-14 14:44 ` [PATCH 12/12] arm: Group remaining dummy symbols somewhat according to functionality Ian Campbell
2012-02-14 15:06 ` [PATCH 00/12 v2] ARM: Slim down dummy.S Tim Deegan
2012-02-14 16:04 ` Stefano Stabellini
2012-02-15 12:25 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329230641-18624-9-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).