From patchwork Mon Jul 28 10:16:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 34347 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3DF4520AE8 for ; Mon, 28 Jul 2014 10:20:24 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lf10sf51873711pab.5 for ; Mon, 28 Jul 2014 03:20:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=ZD5jsnK/Ya/W0QoM7SrfMjLO9dJX7qLLdvufdBtBbak=; b=GeU7/o0Pq4yBAK4ym3TTqbQ5jKuNo+0r32uzjoWAQKGo3mRXCbiypPXapETSHemIc1 j9zbjnZbDBBmDaEcNGZVYkwcznRfMqlAVckO7ZzgO13VkUZU2NFLyG1EdlwhDy5vDs/5 uPoGiPG9Z8FsgCoAKx4xuHRhjvpIsuLKdKD6rrFfugE2gWM97IiqQoOQw6ZHvRooV/iJ 5z+ZajaGWkA6sXKGcEe4tD0sLvHMKARzgF3qiqN1Wf/2I9qOP5bBursl18CXUKChI3jH BUQwctBTlfsh30e4yILQgYjYzpQ4aBPF1UtNVzdg2P+qn+BD+2xgYuo/m4UjL0ZadTse dXtA== X-Gm-Message-State: ALoCoQkKX906IUCGkU2dCokkbyx6MQQQrUfJkVKquAPHOlz1y8Lj7TaDCYHcDYbA32EK39lDLnLT X-Received: by 10.66.228.162 with SMTP id sj2mr16621469pac.11.1406542823024; Mon, 28 Jul 2014 03:20:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.203 with SMTP id v69ls1908445qgd.6.gmail; Mon, 28 Jul 2014 03:20:22 -0700 (PDT) X-Received: by 10.52.231.226 with SMTP id tj2mr36666654vdc.16.1406542822848; Mon, 28 Jul 2014 03:20:22 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id i4si12120831vdg.41.2014.07.28.03.20.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 03:20:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so10838560vcb.36 for ; Mon, 28 Jul 2014 03:20:22 -0700 (PDT) X-Received: by 10.52.37.81 with SMTP id w17mr188038vdj.95.1406542822757; Mon, 28 Jul 2014 03:20:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp154896vcb; Mon, 28 Jul 2014 03:20:22 -0700 (PDT) X-Received: by 10.50.138.11 with SMTP id qm11mr11994679igb.18.1406542822187; Mon, 28 Jul 2014 03:20:22 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id i7si39791752ico.73.2014.07.28.03.20.21 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Jul 2014 03:20:22 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBi0h-0001Zn-IG; Mon, 28 Jul 2014 10:18:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBi0g-0001Zc-GU for xen-devel@lists.xensource.com; Mon, 28 Jul 2014 10:18:26 +0000 Received: from [193.109.254.147:36543] by server-7.bemta-14.messagelabs.com id EE/F7-13362-17326D35; Mon, 28 Jul 2014 10:18:25 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1406542703!12162630!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13762 invoked from network); 28 Jul 2014 10:18:25 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jul 2014 10:18:25 -0000 X-IronPort-AV: E=Sophos;i="5.01,748,1400025600"; d="scan'208";a="156322681" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 28 Jul 2014 10:18:00 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Mon, 28 Jul 2014 06:17:59 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XBi0A-0005Bg-Cr; Mon, 28 Jul 2014 11:17:54 +0100 From: Stefano Stabellini To: Date: Mon, 28 Jul 2014 11:16:48 +0100 Message-ID: <1406542610-18724-1-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA2 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v4 1/3] xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Signed-off-by: Stefano Stabellini --- 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