diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2014-02-01 21:22:54 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-02-01 21:22:54 +0000 |
| commit | 2818c158de6a164d012e6afb0fc145656aed4e4b (patch) | |
| tree | 420833803a3bcd9c6b3f387e0b3d2668a3910c7d /OvmfPkg | |
| parent | c034906e107080a55361693964d3c18ba9ffda66 (diff) | |
| download | edk2-platforms-2818c158de6a164d012e6afb0fc145656aed4e4b.tar.xz | |
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
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/PlatformPei/MemDetect.c | 7 | ||||
| -rw-r--r-- | OvmfPkg/PlatformPei/Platform.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c index 26e4feafe8..b11631127b 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 90be3c33ad..a7221b317b 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -213,8 +213,6 @@ MemMapInitialization ( AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);
AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);
- } else {
- XenPublishRamRegions ();
}
}
@@ -354,9 +352,7 @@ InitializePlatform ( PublishPeiMemory ();
- if (!mXen) {
- InitializeRamRegions ();
- }
+ InitializeRamRegions ();
if (mXen) {
DEBUG ((EFI_D_INFO, "Xen was detected\n"));
|