Changeset 37110 in vbox for trunk/src/VBox

Timestamp:

May 16, 2011 3:36:27 PM (14 years ago)

Author:

vboxsync

Message:

PGMSavedState.cpp: 2nd attempt at working around the PXE ROM issue when loading a state saved by 3.0 with 4.0.

File:

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

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

@@ -2220 +2220 @@
     AssertLogRelMsgReturn(   PGM_PAGE_GET_TYPE(pPage) == uType
                           || uType == PGMPAGETYPE_INVALID
-                          || (   uType == PGMPAGETYPE_ROM /* kudge for the expanded PXE bios (r67885) - #5687. */
+                          /* kudge for the expanded PXE bios (r67885) - #5687: */
+                          || (   uType == PGMPAGETYPE_RAM
                               && GCPhys >= 0xed000
-                              && GCPhys <= 0xeffff),
+                              && GCPhys <= 0xeffff
+                              && PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_ROM)
+                          ,
                           ("pPage=%R[pgmpage] GCPhys=%#x %s\n", pPage, GCPhys, pRam->pszDesc),
                           VERR_SSM_UNEXPECTED_DATA);