From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH v6 1/3] xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86 Date: Fri, 1 Aug 2014 15:45:23 +0100 Message-ID: <1406904325-15722-1-git-send-email-stefano.stabellini@eu.citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, JBeulich@suse.com, Stefano Stabellini List-Id: xen-devel@lists.xenproject.org Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- Changes in v4: - remove define is_domain_direct_mapped in common/memory.c; - define is_domain_direct_mapped as ((void)(d), 0) --- xen/common/memory.c | 4 ---- xen/include/asm-x86/domain.h | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index c2dd31b..d69976f 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -29,10 +29,6 @@ #include #include -#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 abf55fb..59a28ba 100644 --- 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 -- 1.7.10.4