From patchwork Mon Jul 28 15:36:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 34388 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f70.google.com (mail-yh0-f70.google.com [209.85.213.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EDDFD2136C for ; Mon, 28 Jul 2014 15:39:43 +0000 (UTC) Received: by mail-yh0-f70.google.com with SMTP id b6sf27134933yha.1 for ; Mon, 28 Jul 2014 08:39:43 -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=4jv8M3gu1Xlhb1myJnXzgxU1IfOKgJ+MAwCN6F806xk=; b=CBAzqINdiOMkMgKlh2Or7iC2JSr49WA/h5zmQqBoO9BxfdkxNG6coo6TBNtD/2iP3w ZpOSw5efU4TvxfbWmnZb5Mblx7VHtJmnTa5jMBaQEkM2BbmM9gjVBGOCcaF86qLSU9bf s1IZ+2wuU9k9EAzHot8OfBYp5NlnXh4PcjVqXZTRU+PzizPQbabO0/MTFl7tmWiLHmiF GqTtS9Ch+qd3wpNJ73aQUjKAUwa/Cmh7tPBEu8jeeeE+WkU+50S4QjPZBAtcMwfpqnIg izJaevqlsEwwZsAmS7krjFRtRp5Jdkbkk+NKub2Ls+kZq9BsT86Cke+TRivFaSaBq4hm z87w== X-Gm-Message-State: ALoCoQnqq2jfZmy3NmfVav+qIGqhNuwm2+qXeYok68dtRgwQFQR+g7xgxYCEKLppPV12QgMlc0qD X-Received: by 10.52.116.241 with SMTP id jz17mr6304976vdb.9.1406561983730; Mon, 28 Jul 2014 08:39:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.232 with SMTP id n95ls2155739qgn.23.gmail; Mon, 28 Jul 2014 08:39:43 -0700 (PDT) X-Received: by 10.52.15.8 with SMTP id t8mr10373826vdc.18.1406561983554; Mon, 28 Jul 2014 08:39:43 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id bl6si12705503vdd.61.2014.07.28.08.39.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Jul 2014 08:39:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id le20so2724633vcb.0 for ; Mon, 28 Jul 2014 08:39:43 -0700 (PDT) X-Received: by 10.52.244.81 with SMTP id xe17mr38918945vdc.24.1406561983474; Mon, 28 Jul 2014 08:39:43 -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 tc5csp176356vcb; Mon, 28 Jul 2014 08:39:43 -0700 (PDT) X-Received: by 10.50.102.73 with SMTP id fm9mr33455626igb.44.1406561982784; Mon, 28 Jul 2014 08:39:42 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id jw8si21480547icc.89.2014.07.28.08.39.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Jul 2014 08:39:42 -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 1XBmzk-0003tf-48; Mon, 28 Jul 2014 15:37:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XBmzj-0003tL-0B for xen-devel@lists.xensource.com; Mon, 28 Jul 2014 15:37:47 +0000 Received: from [85.158.137.68:5819] by server-2.bemta-3.messagelabs.com id A5/7D-09149-A4E66D35; Mon, 28 Jul 2014 15:37:46 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1406561864!18432458!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 17864 invoked from network); 28 Jul 2014 15:37:45 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-10.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jul 2014 15:37:45 -0000 X-IronPort-AV: E=Sophos;i="5.01,749,1400025600"; d="scan'208";a="156418719" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 28 Jul 2014 15:37:43 +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 11:37:43 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XBmzZ-0002BY-VE; Mon, 28 Jul 2014 16:37:37 +0100 From: Stefano Stabellini To: Date: Mon, 28 Jul 2014 16:36:31 +0100 Message-ID: <1406561793-24630-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 v5 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.169 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 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