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 bd57b7792e212e37263b11fa878fe474d16d11f9..dcfe952219f8041b35caaceef2e1f845ee71f14d 100644 (file)
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -142,8 +142,6 @@ MemDetect (
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
   UpperMemorySize = GetSystemMemorySizeAbove4gb ();\r
 \r
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
   UpperMemorySize = GetSystemMemorySizeAbove4gb ();\r
 \r

-  PublishPeiMemory ();\r
-\r

   //\r
   // Create memory HOBs\r
   //\r
   //\r
   // Create memory HOBs\r
   //\r

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 7363702beecb2f0d0d55276a5a17f302ca36d052..10ae623dddbc4b9c09440a740c31d010bc9463dd 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -420,8 +420,9 @@ InitializePlatform (
 \r
   XenLeaf = XenDetect ();\r
 \r
 \r
   XenLeaf = XenDetect ();\r
 \r

+  PublishPeiMemory ();\r
+\r

   if (XenLeaf != 0) {\r
   if (XenLeaf != 0) {\r

-    PublishPeiMemory ();\r

     PcdSetBool (PcdPciDisableBusEnumeration, TRUE);\r
   } else {\r
     TopOfMemory = MemDetect ();\r
     PcdSetBool (PcdPciDisableBusEnumeration, TRUE);\r
   } else {\r
     TopOfMemory = MemDetect ();\r