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

Timestamp:

Sep 1, 2010 11:37:08 AM (15 years ago)

Author:

vboxsync

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

65456

Message:

Corrected assertion

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• PGMSavedState.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -2120 +2120 @@
     EMSTATE enmCurState = pVCpu->em.s.enmState;
 
-    TMR3NotifyResume(pVM, pVCpu);  /* Stop the virtual time. */
+    TMR3NotifyResume(pVM, pVCpu);  /* Resume the virtual time. */
     pVCpu->em.s.enmState     = pVCpu->em.s.enmPrevState;
     pVCpu->em.s.enmPrevState = enmCurState;

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -3090 +3090 @@
 
                 /* Update pVM->pgm.s.GCPhysCR3. */
-                Assert(pVCpu->pgm.s.GCPhysCR3 == NIL_RTGCPHYS);
+                Assert(pVCpu->pgm.s.GCPhysCR3 == NIL_RTGCPHYS || FTMIsDeltaLoadSaveActive(pVM));
                 RTGCPHYS GCPhysCR3 = CPUMGetGuestCR3(pVCpu);
                 if (    pVCpu->pgm.s.enmGuestMode == PGMMODE_PAE