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

Timestamp:

Mar 9, 2017 7:15:40 PM (8 years ago)

Author:

vboxsync

Message:

pgmR3Load: PGMR3ChangeMode now sets GCPhysCR3, so remove the duplicate and slightly incorrect (AMD64) effort here.

File:

• trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp

@@ -3216 +3216 @@
 
             /*
-             * Change the paging mode and restore PGMCPU::GCPhysCR3.
-             * (The latter requires the CPUM state to be restored already.)
+             * Change the paging mode (indirectly restores PGMCPU::GCPhysCR3).
+             * (Requires the CPUM state to be restored already!)
              */
             if (CPUMR3IsStateRestorePending(pVM))
@@ -3229 +3229 @@
                 rc = PGMR3ChangeMode(pVM, pVCpu, pVCpu->pgm.s.enmGuestMode);
                 AssertLogRelRCReturn(rc, rc);
-
-                /* Update pVM->pgm.s.GCPhysCR3. */
-                Assert(pVCpu->pgm.s.GCPhysCR3 == NIL_RTGCPHYS || FTMIsDeltaLoadSaveActive(pVM));
-                RTGCPHYS GCPhysCR3 = CPUMGetGuestCR3(pVCpu);
-                if (    pVCpu->pgm.s.enmGuestMode == PGMMODE_PAE
-                    ||  pVCpu->pgm.s.enmGuestMode == PGMMODE_PAE_NX
-                    ||  pVCpu->pgm.s.enmGuestMode == PGMMODE_AMD64
-                    ||  pVCpu->pgm.s.enmGuestMode == PGMMODE_AMD64_NX)
-                    GCPhysCR3 = (GCPhysCR3 & X86_CR3_PAE_PAGE_MASK);
-                else
-                    GCPhysCR3 = (GCPhysCR3 & X86_CR3_PAGE_MASK);
-                pVCpu->pgm.s.GCPhysCR3 = GCPhysCR3;
 
                 /* Update the PSE, NX flags and validity masks. */