Changeset 8112 in vbox

Timestamp:

Apr 17, 2008 4:19:18 PM (17 years ago)

Author:

vboxsync

Message:

Another attempt at a proper check. (init order messed up the previous one)

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/CPUM.cpp (modified) (2 diffs)
• src/VBox/VMM/PGM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)

trunk/include/VBox/pgm.h

@@ -38 +38 @@
  * @{
  */
+
+/* remove after fixing the switcher */
+#define PGM_WITH_BROKEN_32PAE_SWITCHER
 
 /** Chunk size for dynamically allocated physical memory. */

trunk/src/VBox/VMM/CPUM.cpp

@@ -406 +406 @@
     }
 
+#ifndef PGM_WITH_BROKEN_32PAE_SWITCHER
     /* Check if PAE was explicitely enabled by the user. */
     bool fEnable = false;
@@ -411 +412 @@
     if (VBOX_SUCCESS(rc) && fEnable)
         CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
+#endif
 
     /*

trunk/src/VBox/VMM/PGM.cpp

@@ -1580 +1580 @@
     LogFlow(("PGMR3Relocate\n"));
 
-    /* Note: remove this restriction once the 32->PAE switcher works properly. */
-    if (    CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE)
-        &&  PGMGetHostMode(pVM) <= PGMMODE_32_BIT
-        &&  !HWACCMIsEnabled(pVM))
-    {
-        CPUMClearGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
-        LogRel(("WARNING: Can't turn on PAE when the host is in 32 bits paging mode!!\n"));
-    }
+#ifdef PGM_WITH_BROKEN_32PAE_SWITCHER
+    if (!CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE))
+    {
+        bool fEnable = false;
+        int rc = CFGMR3QueryBool(CFGMR3GetRoot(pVM), "EnablePAE", &fEnable);
+        if (    VBOX_SUCCESS(rc) 
+            &&  fEnable
+            &&  (PGMGetHostMode(pVM) >= PGMMODE_PAE || HWACCMIsEnabled(pVM))
+           )
+        {
+            CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
+            LogRel(("PGMR3Relocate: turned on PAE\n"));
+        }
+    }
+#endif
 
     /*

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

@@ -27 +27 @@
 #include "CPUMInternal.h"
 #include <VBox/vm.h>
+#include <VBox/pgm.h>
+#include <VBox/hwaccm.h>
 #include <VBox/err.h>
 #include <VBox/dis.h>
@@ -1034 +1036 @@
                 return;
             }
+#ifdef PGM_WITH_BROKEN_32PAE_SWITCHER
+            /* Remove this restriction once the 32->PAE switcher works properly. */
+            if (    PGMGetHostMode(pVM) <= PGMMODE_32_BIT
+                &&  !HWACCMIsEnabled(pVM))
+            {
+                LogRel(("WARNING: Can't turn on PAE when the host is in 32 bits paging mode!!\n"));
+                return;
+            }
+#endif
 
             if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)