Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <[email protected]>
---
OvmfPkg/PlatformPei/MemDetect.c | 7 ++++++-
OvmfPkg/PlatformPei/Platform.c | 7 +------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 26e4fea..b116311 100644
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -168,5 +168,10 @@ InitializeRamRegions (
VOID
)
{
- QemuInitializeRam ();
+ if (!mXen) {
+ QemuInitializeRam ();
+ } else {
+ DEBUG ((EFI_D_INFO, "Using memory map provided by Xen\n"));
+ XenPublishRamRegions ();
+ }
}
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index a17f636..7a6aa3e 100644
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -214,9 +214,6 @@ MemMapInitialization (
AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);
AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);
- } else {
- DEBUG ((EFI_D_INFO, "Using memory map provided by Xen\n"));
- XenPublishRamRegions ();
}
}
@@ -354,9 +351,7 @@ InitializePlatform (
PublishPeiMemory ();
- if (!mXen) {
- InitializeRamRegions ();
- }
+ InitializeRamRegions ();
if (mXen) {
DEBUG ((EFI_D_INFO, "Xen was detected\n"));
--
1.8.5.3
------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable
security intelligence. It gives you real-time visual feedback on key
security issues and trends. Skip the complicated setup - simply import
a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-devel
