Changeset 15647 in vbox for trunk/src/VBox/VMM/PGM.cpp

Timestamp:

Dec 18, 2008 12:12:46 PM (16 years ago)

Author:

vboxsync

Message:

PGM: Reverted r40889 (horribly ugly VMMDev Heap hack) as this has been fixed by disabling the heap when converting a 2.0/1.6 settings file with saved state to 2.1.

File:

• trunk/src/VBox/VMM/PGM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -2472 +2472 @@
             return VERR_SSM_DATA_UNIT_FORMAT_CHANGED;
         }
-
-        /* This is a horribly ugly hack for an 2.0 -> 2.1 incompatibility
-           in the VMMDev PCI regions. VMMDev Heap was added in 2.1 and we
-           simply skip it here if it's not in the saved state. */
-        if (    (   GCPhys != pRam->GCPhys
-                 || GCPhysLast != pRam->GCPhysLast
-                 || cb != pRam->cb
-                 || fHaveBits != !!pRam->pvR3)
-            &&  !strcmp(pRam->pszDesc, "VMMDev Heap")
-            &&  pRam->pNextR3)
-            pRam = pRam->pNextR3; /* don't increment i. */
 
         /* Match it up with the current range. */