Ovmf/Xen: move Xen interface version to <xen.h>

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 <stefano.stabellini@eu.citrix.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16967 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
index 79697fcb6152af907d80872c6dc70e21c92ad650..1cd7ab3ab136721af3271495ce244f1f2a1199d2 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Xen/xen.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
@@ -27,6 +27,11 @@
 #ifndef __XEN_PUBLIC_XEN_H__\r
 #define __XEN_PUBLIC_XEN_H__\r
 \r
+//\r
+// Xen interface version used by Tianocore\r
+//\r
+#define __XEN_INTERFACE_VERSION__ 0x00040400\r
+\r
 #include "xen-compat.h"\r
 \r
 #if defined(MDE_CPU_IA32) || defined(MDE_CPU_X64)\r

diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.h b/OvmfPkg/XenBusDxe/XenBusDxe.h
index 11640223ebf4dba90cf9817be67d0cd1497640aa..80253b7d1ca9e446ed40221322384276c4cd4714 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenBusDxe.h
+++ b/OvmfPkg/XenBusDxe/XenBusDxe.h
@@ -18,11 +18,6 @@
 \r
 #include <Uefi.h>\r
 \r
-//\r
-// Xen interface version used\r
-//\r
-#define  __XEN_INTERFACE_VERSION__ 0x00040400\r
-\r
 //\r
 // Libraries\r
 //\r

diff --git a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h
index e5b1b5f4b90dfb7339df21d41ad35afd5bb38528..c0b62c4f38ca6313d81dae8e5aef856a8258e6e5 100644 (file)
--- a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h
+++ b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h
@@ -18,10 +18,6 @@
 \r
 #include <Uefi.h>\r
 \r
-//\r
-// Xen interface version used\r
-//\r
-#define __XEN_INTERFACE_VERSION__ 0x00040400\r
 #define xen_mb() MemoryFence()\r
 #define xen_rmb() MemoryFence()\r
 #define xen_wmb() MemoryFence()\r