Changeset 8106 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 17, 2008 2:58:10 PM (17 years ago)

Author:

vboxsync

Message:

Refuse to activate PAE mode when the host is using 32 bits paging.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -27 +27 @@
 #include "CPUMInternal.h"
 #include <VBox/vm.h>
+#include <VBox/pgm.h>
 #include <VBox/err.h>
 #include <VBox/dis.h>
@@ -1031 +1032 @@
             if (!(ASMCpuId_EDX(1) & X86_CPUID_FEATURE_EDX_PAE))
             {
-                AssertMsgFailed(("ERROR: Can't turn on PAE when the host doesn't support it!!\n"));
+                LogRel(("WARNING: Can't turn on PAE when the host doesn't support it!!\n"));
+                return;
+            }
+            if (PGMGetShadowMode(pVM) <= PGMMODE_32_BIT)
+            {
+                LogRel(("WARNING: Can't turn on PAE when the host is in 32 bits paging mode!!\n"));
                 return;
             }