ArmPlatformPkg/NorFlashPlatformLib: remove unused Guid member from struct

[mirror_edk2.git] / OvmfPkg / QemuVideoDxe / VbeShim.c

diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.c b/OvmfPkg/QemuVideoDxe/VbeShim.c
index e45a08e8873f15cdf366b0b4a537e6b579460392..8ba5522cde3ceca0d78e331c01ebdae29623a4fe 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/VbeShim.c
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.c
@@ -75,6 +75,20 @@ InstallVbeShim (
   UINTN                Printed;\r
   VBE_MODE_INFO        *VbeModeInfo;\r
 \r
+  if ((PcdGet8 (PcdNullPointerDetectionPropertyMask) & (BIT0|BIT7)) == BIT0) {\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: page 0 protected, not installing VBE shim\n",\r
+      __FUNCTION__\r
+      ));\r
+    DEBUG ((\r
+      DEBUG_WARN,\r
+      "%a: page 0 protection prevents Windows 7 from booting anyway\n",\r
+      __FUNCTION__\r
+      ));\r
+    return;\r
+  }\r
+\r
   Segment0 = 0x00000;\r
   SegmentC = 0xC0000;\r
   SegmentF = 0xF0000;\r