Changeset 24520 in vbox for trunk/src

Timestamp:

Nov 9, 2009 4:41:30 PM (15 years ago)

Author:

vboxsync

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

54618

Message:

Got rid of annoying inability to sometimes load vt-x release states with debug builds (private debug only)

File:

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

trunk/src/VBox/VMM/PGMSavedState.cpp

@@ -2772 +2772 @@
         PPGMMAPPING pMapping;
         for (pMapping = pPGM->pMappingsR3; pMapping; pMapping = pMapping->pNextR3)
+        {
             if (    pMapping->cPTs == cPTs
                 &&  !strcmp(pMapping->pszDesc, szDesc))
                 break;
+#ifdef DEBUG_sandervl
+            if (    !strcmp(szDesc, "Hypervisor Memory Area")
+                &&  HWACCMIsEnabled(pVM))
+                break;
+#endif
+        }
         if (!pMapping)
             return SSMR3SetCfgError(pSSM, RT_SRC_POS, N_("Couldn't find mapping: cPTs=%#x szDesc=%s (GCPtr=%RGv)"),
@@ -2780 +2787 @@
 
         /* relocate it. */
-        if (pMapping->GCPtr != GCPtr)
+        if (    pMapping->GCPtr != GCPtr
+#ifdef DEBUG_sandervl
+             && !(!strcmp(szDesc, "Hypervisor Memory Area") && HWACCMIsEnabled(pVM))
+#endif
+           )
         {
             AssertMsg((GCPtr >> X86_PD_SHIFT << X86_PD_SHIFT) == GCPtr, ("GCPtr=%RGv\n", GCPtr));