Changeset 18267 in vbox for trunk/src/VBox

Timestamp:

Mar 25, 2009 5:50:29 PM (16 years ago)

Author:

vboxsync

Message:

PATM: XP restore frequently crashes here, added todo for now.

File:

• trunk/src/VBox/VMM/PATM/PATMSSM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PATM/PATMSSM.cpp

@@ -583 +583 @@
         pPatchRec->patch.pPrivInstrHC   = 0;
         /* The GC virtual ptr is fixed, but we must convert it manually again to HC. */
-        rc = PGMPhysGCPtr2R3Ptr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTR3PTR)&pPatchRec->patch.pPrivInstrHC);
+        int rc2 = rc = PGMPhysGCPtr2R3Ptr(pVM, pPatchRec->patch.pPrivInstrGC, (PRTR3PTR)&pPatchRec->patch.pPrivInstrHC);
         /* Can fail due to page or page table not present. */
 
@@ -614 +614 @@
                     unsigned offset = (pPatchRec->patch.cbPatchJump == SIZEOF_NEARJUMP32) ? 1 : 2;
 
-                    Assert(pPatchRec->patch.pPrivInstrHC);
+                    /** @todo This will fail & crash in patmCorrectFixup if the page isn't present
+                     *        when we restore. Happens with my XP image here
+                     *        (pPrivInstrGC=0x8069e051). */
+                    AssertLogRelMsg(pPatchRec->patch.pPrivInstrHC, ("%RRv rc=%Rrc\n", pPatchRec->patch.pPrivInstrGC, rc2));
                     rec.pRelocPos = pPatchRec->patch.pPrivInstrHC + offset;
                     pFixup        = (RTRCPTR *)rec.pRelocPos;