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

Timestamp:

Jan 15, 2007 5:35:58 PM (18 years ago)

Author:

vboxsync

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

17468

Message:

Fixed state loading.

File:

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

trunk/src/VBox/VMM/PGM.cpp

@@ -1600 +1600 @@
         if (pRam->fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC)
         {
+            bool fPreAlloc = false;
+
+            rc = CFGMR3QueryBool(CFGMR3GetRoot(pVM), "PreAlloc", &fPreAlloc);
+            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+                fPreAlloc = false;
+
             for (unsigned iChunk = 0; iChunk < (pRam->cb >> PGM_DYNAMIC_CHUNK_SHIFT); iChunk++)
             {
@@ -1612 +1618 @@
                 if (fValidChunk)
                 {
-                    rc = pgmr3PhysGrowRange(pVM, pRam->GCPhys + iChunk * PGM_DYNAMIC_CHUNK_SIZE);
-                    if (VBOX_FAILURE(rc))
-                        return rc;
+                    /* The first chunk is always present. (all chunks are present if guest ram is preallocated) */
+                    if (    iChunk != 0 
+                        && !fPreAlloc)
+                    {
+                        rc = pgmr3PhysGrowRange(pVM, pRam->GCPhys + iChunk * PGM_DYNAMIC_CHUNK_SIZE);
+                        if (VBOX_FAILURE(rc))
+                            return rc;
+                    }
 
                     Assert(pRam->pavHCChunkHC[iChunk]);