OvmfPkg/Include/...Xen: Convert __i386__/__x86_64__ to MDE_CPU_IA32/MDE_CPU_X64.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16293 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Include/IndustryStandard/Xen/README b/OvmfPkg/Include/IndustryStandard/Xen/README
index 0553ed729cf0aa10de33aad131feedd51dead679..8cb7f715b7a18f43dea6f4eecd72ecc735aa8e67 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Xen/README
+++ b/OvmfPkg/Include/IndustryStandard/Xen/README
@@ -32,3 +32,6 @@ s/([^a-zA-Z0-9_]|^)unsigned char([^a-zA-Z0-9_]|$)/\1UINT8\2/g
 s/([^a-zA-Z0-9_]|^)char([^a-zA-Z0-9_]|$)/\1CHAR8\2/g\r
 s/([^a-zA-Z0-9_]|^)unsigned long([^a-zA-Z0-9_]|$)/\1UINTN\2/g\r
 s/([^a-zA-Z0-9_]|^)long([^a-zA-Z0-9_]|$)/\1INTN\2/g\r
+\r
+s/__i386__/MDE_CPU_IA32/g\r
+s/__x86_64__/MDE_CPU_X64/g\r

diff --git a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h
index 00ba175e1ec10a826000460a7e6244dcfc44c849..684ca688c09a29bf9425ae05eb213cc9f546323f 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h
@@ -59,9 +59,9 @@
 #endif\r
 #define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)\r
 \r
-#if defined(__i386__)\r
+#if defined(MDE_CPU_IA32)\r
 #include "xen-x86_32.h"\r
-#elif defined(__x86_64__)\r
+#elif defined(MDE_CPU_X64)\r
 #include "xen-x86_64.h"\r
 #endif\r
 \r
@@ -82,7 +82,7 @@ typedef UINTN xen_ulong_t;
 \r
 typedef UINT64 tsc_timestamp_t; /* RDTSC timestamp */\r
 \r
-#ifdef __i386__\r
+#ifdef MDE_CPU_IA32\r
 #pragma pack(4)\r
 #endif\r
 struct arch_shared_info {\r
@@ -93,7 +93,7 @@ struct arch_shared_info {
     UINT64 pad[32];\r
 };\r
 typedef struct arch_shared_info arch_shared_info_t;\r
-#ifdef __i386__\r
+#ifdef MDE_CPU_IA32\r
 #pragma pack()\r
 #endif\r
 \r

diff --git a/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h b/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h
index 9646b9b1458245a4399c3c474326711831947138..cac33359ceb0b51b57078166e9b29878e04dca41 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h
@@ -54,7 +54,7 @@
 #define HVM_PARAM_BUFIOREQ_PFN 6\r
 #define HVM_PARAM_BUFIOREQ_EVTCHN 26\r
 \r
-#if defined(__i386__) || defined(__x86_64__)\r
+#if defined(MDE_CPU_IA32) || defined(MDE_CPU_X64)\r
 \r
 /* Expose Viridian interfaces to this HVM guest? */\r
 #define HVM_PARAM_VIRIDIAN     9\r

diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h b/OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h
index 5130e3a4f00f82f4258b0f759dc95b1025eb6405..ebed5799bc2e7994eabb0d039ce5a2c6d5370c3d 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h
@@ -530,7 +530,7 @@ struct blkif_request_segment {
 /*\r
  * Starting ring element for any I/O request.\r
  */\r
-#if defined(__i386__)\r
+#if defined(MDE_CPU_IA32)\r
 //\r
 // pack(4) is necessary when these structs are compiled for Ia32.\r
 // Without it, the struct will have a different alignment than the one\r
@@ -571,7 +571,7 @@ struct blkif_request_indirect {
     blkif_sector_t sector_number;/* start sector idx on disk (r/w only)  */\r
     blkif_vdev_t   handle;       /* same as for read/write requests      */\r
     grant_ref_t    indirect_grefs[BLKIF_MAX_INDIRECT_PAGES_PER_REQUEST];\r
-#ifdef __i386__\r
+#ifdef MDE_CPU_IA32\r
     UINT64       pad;          /* Make it 64 byte aligned on i386      */\r
 #endif\r
 };\r
@@ -583,7 +583,7 @@ struct blkif_response {
     INT16         status;          /* BLKIF_RSP_???       */\r
 };\r
 typedef struct blkif_response blkif_response_t;\r
-#if defined(__i386__)\r
+#if defined(MDE_CPU_IA32)\r
 #pragma pack()\r
 #endif\r
 \r

diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h b/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h
index 5982a8b9912c45eb0f2047289043687998edf37e..e2cbd871aa7ce322af7665034dd3ca4751115a11 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h
@@ -27,9 +27,9 @@
 #define XEN_IO_PROTO_ABI_X86_64     "x86_64-abi"\r
 #define XEN_IO_PROTO_ABI_ARM        "arm-abi"\r
 \r
-#if defined(__i386__)\r
+#if defined(MDE_CPU_IA32)\r
 # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32\r
-#elif defined(__x86_64__)\r
+#elif defined(MDE_CPU_X64)\r
 # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64\r
 #elif defined(__arm__) || defined(__aarch64__)\r
 # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_ARM\r

diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
index 9289800be0ed703e85289b13a5cf57980078b784..79697fcb6152af907d80872c6dc70e21c92ad650 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Xen/xen.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
@@ -29,7 +29,7 @@
 \r
 #include "xen-compat.h"\r
 \r
-#if defined(__i386__) || defined(__x86_64__)\r
+#if defined(MDE_CPU_IA32) || defined(MDE_CPU_X64)\r
 #include "arch-x86/xen.h"\r
 #elif defined(__arm__) || defined (__aarch64__)\r
 #include "arch-arm.h"\r