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 <[email protected]> > --- > 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 <Uefi.h> > > // > -// Xen interface version used > -// > -#define __XEN_INTERFACE_VERSION__ 0x00040400 > - > -// > // Libraries > // > #include <Library/UefiBootServicesTableLib.h> > 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 <Uefi.h> > > -// > -// 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 <[email protected]> ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
