From patchwork Thu Feb 12 11:19:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 44618 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A3DFD2151D for ; Thu, 12 Feb 2015 11:21:02 +0000 (UTC) Received: by lams18 with SMTP id s18sf6079067lam.1 for ; Thu, 12 Feb 2015 03:21:01 -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=J4hjoqk+gb/rtIQx1NwaRwR2eWC4XsFOZxtWcajaRw+8KI7lljvcl+JdJE4KZdrbtU bmJMPSQ4w2zQC+xe5UXMrq9AJL5MYufnoyYaGBE7GlyRq+VbhIDYjhhkDQifa3CyDcTp 99bc2y8IQODWX5/JSvQhmwx0DfYp6mRXNMuiMZj/MuJWg/SkNIfVtJXfliOvL7/AhgHf D2j2Ot9lNpuycb+pMUYERd8cSrLQSP/OaBBs7sA2+1WQ/PVt+awrnL5IRb8lQU+IoDba sogFKg+GhXDIt88wLhKDcwcL/BREKc9CXN84aaB86DP331qOoyqmNKUVajA5saRnCp8Q a3uw== X-Gm-Message-State: ALoCoQl3opagKxvTQFJQh7v3hnzNilb0GkghYGzxDPo3DZsvuGxOT0Lpf3LyExEWfU4VX4hHKcd4 X-Received: by 10.180.80.7 with SMTP id n7mr405364wix.0.1423740061593; Thu, 12 Feb 2015 03:21:01 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.132 with SMTP id b4ls161778lah.16.gmail; Thu, 12 Feb 2015 03:21:01 -0800 (PST) X-Received: by 10.112.140.74 with SMTP id re10mr2853387lbb.80.1423740061368; Thu, 12 Feb 2015 03:21:01 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id an4si2693439lac.99.2015.02.12.03.21.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Feb 2015 03:21:01 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id p9so8026169lbv.3 for ; Thu, 12 Feb 2015 03:21:01 -0800 (PST) X-Received: by 10.152.8.33 with SMTP id o1mr2760871laa.56.1423740061265; Thu, 12 Feb 2015 03:21:01 -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 h5csp378561lbj; Thu, 12 Feb 2015 03:21:00 -0800 (PST) X-Received: by 10.50.78.131 with SMTP id b3mr3153724igx.0.1423740056281; Thu, 12 Feb 2015 03:20:56 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id j84si2808648ioo.12.2015.02.12.03.20.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 12 Feb 2015 03:20:56 -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-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YLrpA-0002Ue-QN; Thu, 12 Feb 2015 11:20:48 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YLrp9-0002Tw-GE for edk2-devel@lists.sourceforge.net; Thu, 12 Feb 2015 11:20:47 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.192.175 as permitted sender) client-ip=209.85.192.175; envelope-from=ard.biesheuvel@linaro.org; helo=mail-pd0-f175.google.com; Received: from mail-pd0-f175.google.com ([209.85.192.175]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YLrp8-0004js-Kq for edk2-devel@lists.sourceforge.net; Thu, 12 Feb 2015 11:20:47 +0000 Received: by pdjg10 with SMTP id g10so11417262pdj.1 for ; Thu, 12 Feb 2015 03:20:41 -0800 (PST) X-Received: by 10.68.185.194 with SMTP id fe2mr5509489pbc.136.1423740040973; Thu, 12 Feb 2015 03:20:40 -0800 (PST) Received: from ards-macbook-pro.local ([210.177.145.249]) by mx.google.com with ESMTPSA id n4sm3554887pdl.12.2015.02.12.03.20.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Feb 2015 03:20:40 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, olivier.martin@arm.com, lersek@redhat.com, roy.franz@linaro.org, leif.lindholm@linaro.org, stefano.stabellini@eu.citrix.com, ian.campbell@citrix.com, anthony.perard@citrix.com, xen-devel@lists.xen.org, julien.grall@linaro.org, jordan.l.justen@intel.com, michael.d.kinney@intel.com, feng.tian@intel.com Date: Thu, 12 Feb 2015 19:19:07 +0800 Message-Id: <1423739961-5945-16-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1423739961-5945-1-git-send-email-ard.biesheuvel@linaro.org> References: <1423739961-5945-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 -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1YLrp8-0004js-Kq Subject: [edk2] [PATCH v4 15/29] 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.217.172 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()