From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laszlo Ersek Subject: Re: [PATCH v1 11/21] Ovmf/Xen: move Xen interface version to Date: Sat, 24 Jan 2015 00:54:12 +0100 Message-ID: <54C2DF24.3040509__21060.5557113469$1422057369$gmane$org@redhat.com> References: <1422025390-8036-1-git-send-email-ard.biesheuvel@linaro.org> <1422025390-8036-12-git-send-email-ard.biesheuvel@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1422025390-8036-12-git-send-email-ard.biesheuvel@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ard Biesheuvel , edk2-devel@lists.sourceforge.net, 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 List-Id: xen-devel@lists.xenproject.org On 01/23/15 16:03, Ard Biesheuvel wrote: > 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() > Acked-by: Laszlo Ersek