From: Jordan Justen <jordan.l.justen@intel.com>
Date: Wed, 29 Jan 2014 21:44:09 +0000 (+0000)
Subject: OvmfPkg/PlatformPei: Call PublishPeiMemory in one place
X-Git-Tag: edk2-stable201903~11762
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=f76e9eba9deded0a2a25987256ccd5ca7b828927

OvmfPkg/PlatformPei: Call PublishPeiMemory in one place

The Xen and QEMU/KVM paths were calling this at nearly
the same time in the boot flow anyhow, so just make
the call in one spot.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15195 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index bd57b7792e..dcfe952219 100644
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -142,8 +142,6 @@ MemDetect (
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();
   UpperMemorySize = GetSystemMemorySizeAbove4gb ();
 
-  PublishPeiMemory ();
-
   //
   // Create memory HOBs
   //
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 7363702bee..10ae623ddd 100644
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -420,8 +420,9 @@ InitializePlatform (
 
   XenLeaf = XenDetect ();
 
+  PublishPeiMemory ();
+
   if (XenLeaf != 0) {
-    PublishPeiMemory ();
     PcdSetBool (PcdPciDisableBusEnumeration, TRUE);
   } else {
     TopOfMemory = MemDetect ();