From patchwork Tue Feb 24 18:02:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 44984 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8E4FD2029F for ; Tue, 24 Feb 2015 18:07:08 +0000 (UTC) Received: by wesq59 with SMTP id q59sf18438106wes.2 for ; Tue, 24 Feb 2015 10:07:07 -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:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=1We+czzKJchUWvd9Yn5CCnHZNG3ln77yKlf0m7jS3EM=; b=m3VlpKr5Zrp5UFl3pIbUPdwZsX+E8GB9vXFTt7cKmgX+4mDJ1ZS0AcKm6Xe7sxh8Vo tK4g+qEmHi/BYYUq+UDDnWj10leMv5CoXpZWSLai3AH1AZs9vWXM7L9B+3b3+hadHI6y sntv3jHP4mLEIRXHavQSqjZwtDxlSiSauE6zKQrE3L1Mm3gmAW1m6I2U2JfFgAPM4K3Q RYNo+liXoYS3XQU/oHQWiXwjIZ72AWu5Z2hjB4xPFcmR47H/cnke0GQYjYWDAjHKibnu 2T6UxgL/Ur+gc3xWgynjueIzT1717Be2C46lH+BJFH6LUT+51qwc4pgtN/yIl555F+U6 KROQ== X-Gm-Message-State: ALoCoQlCa9Kxwj2blNatURsS58TYCVmHaa2qSTsEMWmSlThXmYEO6k6cfYl0+fNY2GBFSenPRb4r X-Received: by 10.194.221.65 with SMTP id qc1mr2337078wjc.7.1424801227811; Tue, 24 Feb 2015 10:07:07 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.232 with SMTP id t8ls703315laj.100.gmail; Tue, 24 Feb 2015 10:07:07 -0800 (PST) X-Received: by 10.152.170.199 with SMTP id ao7mr1155108lac.27.1424801227656; Tue, 24 Feb 2015 10:07:07 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id i7si7945414laa.43.2015.02.24.10.07.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Feb 2015 10:07:07 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by labhs14 with SMTP id hs14so4871370lab.4 for ; Tue, 24 Feb 2015 10:07:07 -0800 (PST) X-Received: by 10.152.88.4 with SMTP id bc4mr15511821lab.86.1424801227559; Tue, 24 Feb 2015 10:07:07 -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 h5csp2079680lbj; Tue, 24 Feb 2015 10:07:06 -0800 (PST) X-Received: by 10.236.28.71 with SMTP id f47mr15702637yha.84.1424801226151; Tue, 24 Feb 2015 10:07:06 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id t4si10166756qap.75.2015.02.24.10.07.05 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 24 Feb 2015 10:07:06 -0800 (PST) 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 1YQJr3-0002Vm-4j; Tue, 24 Feb 2015 18:05:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YQJr1-0002SI-7c for xen-devel@lists.xen.org; Tue, 24 Feb 2015 18:05:07 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id CB/25-02777-25DBCE45; Tue, 24 Feb 2015 18:05:06 +0000 X-Env-Sender: ard.biesheuvel@linaro.org X-Msg-Ref: server-7.tower-27.messagelabs.com!1424801105!12541988!1 X-Originating-IP: [74.125.82.50] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27122 invoked from network); 24 Feb 2015 18:05:05 -0000 Received: from mail-wg0-f50.google.com (HELO mail-wg0-f50.google.com) (74.125.82.50) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 24 Feb 2015 18:05:05 -0000 Received: by wgha1 with SMTP id a1so6996779wgh.12 for ; Tue, 24 Feb 2015 10:05:05 -0800 (PST) X-Received: by 10.180.207.6 with SMTP id ls6mr33142759wic.13.1424801105582; Tue, 24 Feb 2015 10:05:05 -0800 (PST) Received: from ards-macbook-pro.lan (bl11-65-113.dsl.telepac.pt. [85.244.65.113]) by mx.google.com with ESMTPSA id w8sm12792521wja.4.2015.02.24.10.04.57 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Feb 2015 10:05:04 -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 Date: Tue, 24 Feb 2015 18:02:56 +0000 Message-Id: <1424800990-15777-16-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1424800990-15777-1-git-send-email-ard.biesheuvel@linaro.org> References: <1424800990-15777-1-git-send-email-ard.biesheuvel@linaro.org> Cc: wei.liu2@citrix.com, Ard Biesheuvel Subject: [Xen-devel] [PATCH v5 15/29] Ovmf/Xen: move Xen interface version to 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: , MIME-Version: 1.0 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: 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.44 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: 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 Reviewed-by: Anthony PERARD 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()