In the following patches we'll make memory reservations dependent on S3 support (as configured by the host admin for the guest). We must not enter the S3 boot path without having reserved memory.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <[email protected]> --- OvmfPkg/PlatformPei/PlatformPei.inf | 1 + OvmfPkg/PlatformPei/Platform.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf index 93ffa68..e851046 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -57,6 +57,7 @@ MtrrLib PcdLib EmuNvramLib + QemuFwCfgLib [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index f63cf02..d721f80 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -38,6 +38,7 @@ #include <IndustryStandard/E820.h> #include <Library/ResourcePublicationLib.h> #include <Library/MtrrLib.h> +#include <Library/QemuFwCfgLib.h> #include "Platform.h" #include "Cmos.h" @@ -422,6 +423,7 @@ InitializePlatform ( DebugDumpCmos (); S3Resume = (CmosRead8 (0xF) == 0xFE); + ASSERT (!S3Resume || !QemuFwCfgS3Disabled ()); XenLeaf = XenDetect (); -- 1.8.3.1 ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
