xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 031672a81bcb791681c890e30fd79522e9df3c30..2e3225df74374eb35538a0f42b1aeff69670a888 100644 (file)
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -29,10 +29,6 @@
 #include <xsm/xsm.h>
 #include <xen/trace.h>
 
-#ifndef is_domain_direct_mapped
-# define is_domain_direct_mapped(d) ((void)(d), 0)
-#endif
-
 struct memop_args {
     /* INPUT */
     struct domain *domain;     /* Domain to be affected. */

diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index 83329ed3bc346ecadfec5980e9a58ef380a7624a..8fc5a45bc05ce81a717f18eae715d999c727f3fe 100644 (file)
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -19,6 +19,7 @@
 #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \
         d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector)
 #define is_hvm_pv_evtchn_vcpu(v) (is_hvm_pv_evtchn_domain(v->domain))
+#define is_domain_direct_mapped(d) ((void)(d), 0)
 
 #define VCPU_TRAP_NMI          1
 #define VCPU_TRAP_MCE          2