summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2015-02-28 20:32:06 +0000
committerlersek <lersek@Edk2>2015-02-28 20:32:06 +0000
commit0ac10d1d8e07867cb80cc8557e78b2ffc9385c1c (patch)
treec756f1c1ce1e69709b9c7eb014e8ff0e40c80a17
parent9b89163eea30762f7ab91dcdc414820173cbf858 (diff)
downloadedk2-0ac10d1d8e07867cb80cc8557e78b2ffc9385c1c.tar.gz
edk2-0ac10d1d8e07867cb80cc8557e78b2ffc9385c1c.tar.bz2
edk2-0ac10d1d8e07867cb80cc8557e78b2ffc9385c1c.zip
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
-rw-r--r--OvmfPkg/Include/IndustryStandard/Xen/xen.h5
-rw-r--r--OvmfPkg/XenBusDxe/XenBusDxe.h5
-rw-r--r--OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.h4
3 files changed, 5 insertions, 9 deletions
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
index 79697fcb61..1cd7ab3ab1 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 11640223eb..80253b7d1c 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 e5b1b5f4b9..c0b62c4f38 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()