OvmfPkg/PlatformPei: Add RAM for Xen in InitializeRamRegions

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

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 26e4feafe8e399366c12e6b023497a4d6f957f29..b11631127ba9cb944ea16d5b13f118aa5de30d11 100644 (file)
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -168,5 +168,10 @@ InitializeRamRegions (
   VOID\r
   )\r
 {\r
-  QemuInitializeRam ();\r
+  if (!mXen) {\r
+    QemuInitializeRam ();\r
+  } else {\r
+    DEBUG ((EFI_D_INFO, "Using memory map provided by Xen\n"));\r
+    XenPublishRamRegions ();\r
+  }\r
 }\r

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 90be3c33ad0dbce1283bc5c22787a9812d65d720..a7221b317b8375ee1a53acfe748676a0847aefe2 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -213,8 +213,6 @@ MemMapInitialization (
     AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);\r
     AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);\r
     AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);\r
-  } else {\r
-    XenPublishRamRegions ();\r
   }\r
 }\r
 \r
@@ -354,9 +352,7 @@ InitializePlatform (
 \r
   PublishPeiMemory ();\r
 \r
-  if (!mXen) {\r
-    InitializeRamRegions ();\r
-  }\r
+  InitializeRamRegions ();\r
 \r
   if (mXen) {\r
     DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r