From patchwork Fri Jan 23 15:03:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 43660 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EB335218DB for ; Fri, 23 Jan 2015 15:04:23 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id c13sf5137183eek.1 for ; Fri, 23 Jan 2015 07:04:22 -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=8uolRU7/hOrm7A/ciEXeyWF9ZNRUHtfkGuj68s/N7Rc=; b=AxF1vMW/t7mYjIS6BiRa5B4MgNQrIaC6tF1BvujfQDk0QbQ9MubSyGNhB1XUdHgvV0 S2yDaEcRzT8FB8b67q35tdqAJAskkIgLhAMHhaVhWL4IBRypLqJVFdBoDpZByNTDb0MR bNInioIht7rFv1q/RDV1GvPwfx02UcAYT380Z2YVCHQj9fUDwvItE3qPKlgujvlramCQ RdyTcmRB2Z8Y+Hf6PW1/k/20R8VPc2trO5wvM9CL3KZ84AXyIi07siojOD9kMLM6uPK0 lcoeLhsBkgGQjKTKBizU02KdI1cqBQrstmh91KCIbz7lH9C4+eLmSeBhQNgk8T8YVgtb ZZWw== X-Gm-Message-State: ALoCoQm7rs1amr7DGE+iaQg6il01rvqa45MITZgh+fDD0Vi0iugTiuDDRJvNpCf72h6mRiOwMH0m X-Received: by 10.180.74.140 with SMTP id t12mr357735wiv.2.1422025462771; Fri, 23 Jan 2015 07:04:22 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.182.140 with SMTP id ee12ls9964lac.1.gmail; Fri, 23 Jan 2015 07:04:22 -0800 (PST) X-Received: by 10.152.185.72 with SMTP id fa8mr7717146lac.73.1422025462289; Fri, 23 Jan 2015 07:04:22 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id pl3si1629314lac.8.2015.01.23.07.04.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jan 2015 07:04:22 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id gq15so7735778lab.12 for ; Fri, 23 Jan 2015 07:04:22 -0800 (PST) X-Received: by 10.112.30.71 with SMTP id q7mr7803704lbh.41.1422025462186; Fri, 23 Jan 2015 07:04:22 -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.9.200 with SMTP id c8csp283136lbb; Fri, 23 Jan 2015 07:04:21 -0800 (PST) X-Received: by 10.50.79.230 with SMTP id m6mr2339868igx.20.1422025460636; Fri, 23 Jan 2015 07:04:20 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id k5si1835526icw.37.2015.01.23.07.04.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 23 Jan 2015 07:04:20 -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 1YEfmN-0007pz-Q5; Fri, 23 Jan 2015 15:04:11 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YEfmL-0007pb-KH for edk2-devel@lists.sourceforge.net; Fri, 23 Jan 2015 15:04:09 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.212.169 as permitted sender) client-ip=209.85.212.169; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wi0-f169.google.com; Received: from mail-wi0-f169.google.com ([209.85.212.169]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YEfmH-0003hu-6X for edk2-devel@lists.sourceforge.net; Fri, 23 Jan 2015 15:04:09 +0000 Received: by mail-wi0-f169.google.com with SMTP id bs8so3506421wib.0 for ; Fri, 23 Jan 2015 07:03:59 -0800 (PST) X-Received: by 10.194.78.229 with SMTP id e5mr14664160wjx.11.1422025439218; Fri, 23 Jan 2015 07:03:59 -0800 (PST) Received: from ards-macbook-pro.local ([197.129.136.117]) by mx.google.com with ESMTPSA id pl1sm2176036wic.16.2015.01.23.07.03.56 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 Jan 2015 07:03:58 -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 Date: Fri, 23 Jan 2015 15:03:00 +0000 Message-Id: <1422025390-8036-12-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1422025390-8036-1-git-send-email-ard.biesheuvel@linaro.org> References: <1422025390-8036-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: 1YEfmH-0003hu-6X Subject: [edk2] [PATCH v1 11/21] 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.53 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 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()