From patchwork Tue Feb 3 19:19:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 44292 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 049B82034D for ; Tue, 3 Feb 2015 19:21:40 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id m14sf22238119wev.3 for ; Tue, 03 Feb 2015 11:21:39 -0800 (PST) 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:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=oxrgIUP7u/qlEL51kBHWo5KVYiEw7PeK+xbBBwlfDLc=; b=he1VKBQzMTSCBrq8hYCfzPAfGOpJIbxJNbnyyJH6YnuO+X8nuzU06Wbq7at8LRN5fY 16PhDhGI5gQgbOBolJScwDIEw7D0/koY/O21msTJ0roFd6a64qm2a2G75yhDRx0DpBMr +qvPc6SxqpY8eIXd59e2nugnB2TSN3nAaa0VTxXDv19muoSrQi/IJglEP9eLdWqW7eBi rc5j91M31bA53gaEgvU4jlqPVsGDXaUjpLU+7y5U7tIU+1SPICB5AX4eBuqyv7nCrVpG LXsWcZwtRDJb9axiXwkxeZO3kXi3sePaZSyDb4Bwu1YMuOawDrLyJMGgHkICsFKmjPeZ KToA== X-Gm-Message-State: ALoCoQm5w558Smq3u9USFNNvaGBWBpvM04eI2hOhVWtOJy7LX67TdB2nJQUs5lMzKHa7oobac8zv X-Received: by 10.112.180.167 with SMTP id dp7mr1569901lbc.14.1422991299273; Tue, 03 Feb 2015 11:21:39 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.201 with SMTP id e9ls677226lag.67.gmail; Tue, 03 Feb 2015 11:21:39 -0800 (PST) X-Received: by 10.152.42.198 with SMTP id q6mr25697793lal.48.1422991299126; Tue, 03 Feb 2015 11:21:39 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id h9si6301629lae.130.2015.02.03.11.21.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Feb 2015 11:21:39 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id s18so54319986lam.5 for ; Tue, 03 Feb 2015 11:21:39 -0800 (PST) X-Received: by 10.112.180.135 with SMTP id do7mr26332843lbc.23.1422991299036; Tue, 03 Feb 2015 11:21:39 -0800 (PST) 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.112.35.133 with SMTP id h5csp34058lbj; Tue, 3 Feb 2015 11:21:38 -0800 (PST) X-Received: by 10.107.16.32 with SMTP id y32mr30896449ioi.39.1422991297273; Tue, 03 Feb 2015 11:21:37 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id j17si5830753ioi.20.2015.02.03.11.21.36 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 03 Feb 2015 11:21:37 -0800 (PST) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YIj2P-0002Nr-Mu; Tue, 03 Feb 2015 19:21:29 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YIj2O-0002Nh-Hf for edk2-devel@lists.sourceforge.net; Tue, 03 Feb 2015 19:21:28 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.171 as permitted sender) client-ip=209.85.212.171; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wi0-f171.google.com; Received: from mail-wi0-f171.google.com ([209.85.212.171]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YIj2N-0007gl-LO for edk2-devel@lists.sourceforge.net; Tue, 03 Feb 2015 19:21:28 +0000 Received: by mail-wi0-f171.google.com with SMTP id l15so26807579wiw.4 for ; Tue, 03 Feb 2015 11:21:21 -0800 (PST) X-Received: by 10.180.74.6 with SMTP id p6mr8364275wiv.17.1422991280509; Tue, 03 Feb 2015 11:21:20 -0800 (PST) Received: from ards-macbook-pro.local (73.233.28.37.rev.vodafone.pt. [37.28.233.73]) by mx.google.com with ESMTPSA id eb7sm25860139wic.11.2015.02.03.11.21.16 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Feb 2015 11:21:19 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, lersek@redhat.com, olivier.martin@arm.com, roy.franz@linaro.org, leif.lindholm@linaro.org, stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, anthony.perard@citrix.com, christoffer.dall@linaro.org, xen-devel@lists.xen.org, ilias.biris@linaro.org, julien.grall@linaro.org Date: Tue, 3 Feb 2015 19:19:58 +0000 Message-Id: <1422991212-9257-14-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1422991212-9257-1-git-send-email-ard.biesheuvel@linaro.org> References: <1422991212-9257-1-git-send-email-ard.biesheuvel@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1YIj2N-0007gl-LO Subject: [edk2] [PATCH v3 13/27] Ovmf/Xen: move Xen interface version to X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 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 Tiancore has its private copy of the Xen headers, and all drivers that depend on it should use the same Xen interface version, so let's move the #define to xen.h itself. Contributed-under: TianoCore Contribution Agreement 1.0 Reviewed-by: Stefano Stabellini Acked-by: Laszlo Ersek Signed-off-by: Ard Biesheuvel --- OvmfPkg/Include/IndustryStandard/Xen/xen.h | 5 +++++ OvmfPkg/XenBusDxe/XenBusDxe.h | 5 ----- OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/xen.h index 79697fcb6152..1cd7ab3ab136 100644 --- a/OvmfPkg/Include/IndustryStandard/Xen/xen.h +++ b/OvmfPkg/Include/IndustryStandard/Xen/xen.h @@ -27,6 +27,11 @@ #ifndef __XEN_PUBLIC_XEN_H__ #define __XEN_PUBLIC_XEN_H__ +// +// Xen interface version used by Tianocore +// +#define __XEN_INTERFACE_VERSION__ 0x00040400 + #include "xen-compat.h" #if defined(MDE_CPU_IA32) || defined(MDE_CPU_X64) diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.h b/OvmfPkg/XenBusDxe/XenBusDxe.h index 11640223ebf4..80253b7d1ca9 100644 --- a/OvmfPkg/XenBusDxe/XenBusDxe.h +++ b/OvmfPkg/XenBusDxe/XenBusDxe.h @@ -19,11 +19,6 @@ #include // -// Xen interface version used -// -#define __XEN_INTERFACE_VERSION__ 0x00040400 - -// // Libraries // #include diff --git a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h index e5b1b5f4b90d..c0b62c4f38ca 100644 --- a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h +++ b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h @@ -18,10 +18,6 @@ #include -// -// Xen interface version used -// -#define __XEN_INTERFACE_VERSION__ 0x00040400 #define xen_mb() MemoryFence() #define xen_rmb() MemoryFence() #define xen_wmb() MemoryFence()