Changeset 16422 in vbox for trunk/src/VBox

Timestamp:

Jan 30, 2009 3:21:17 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42286

Message:

Just reinit real mode during hwaccm init

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• PGM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -421 +421 @@
     VMMR3DisableSwitcher(pVM);
 
-    if (pVM->hwaccm.s.fNestedPaging)
-    {
-        /* Reinit the paging mode to force the new shadow mode. */
-        PGMR3ChangeMode(pVM, PGMMODE_REAL);
-    }
+    /* Reinit the paging mode to force the new shadow mode. */
+    PGMR3ChangeMode(pVM, PGMMODE_REAL);
 }
 

trunk/src/VBox/VMM/PGM.cpp

@@ -1539 +1539 @@
     }
     rc = pgmR3ModeDataInit(pVM, false /* don't resolve GC and R0 syms yet */);
-#ifndef VBOX_WITH_PGMPOOL_PAGING_ONLY
     if (RT_SUCCESS(rc))
         rc = PGMR3ChangeMode(pVM, PGMMODE_REAL);
-#endif
     if (RT_SUCCESS(rc))
     {
@@ -1958 +1956 @@
         pVM->pgm.s.GCPhys4MBPSEMask = RT_BIT_64(32) - 1;
 
-#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
-    rc = PGMR3ChangeMode(pVM, PGMMODE_REAL);
-    AssertRC(rc);
-#endif
     LogRel(("PGMR3InitFinalize: 4 MB PSE mask %RGp\n", pVM->pgm.s.GCPhys4MBPSEMask));
-
     return rc;
 }