Changeset 107 in vbox for trunk/src/VBox/VMM/MM.cpp

Timestamp:

Jan 17, 2007 3:40:32 PM (18 years ago)

Author:

vboxsync

Message:

error checking. 64-bit.

File:

• trunk/src/VBox/VMM/MM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/MM.cpp

@@ -193 +193 @@
 {
     LogFlow(("MMR3InitPaging:\n"));
+    bool        fPreAlloc;
+    int rc = CFGMR3QueryBool(CFGMR3GetRoot(pVM), "RamPreAlloc", &fPreAlloc);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        fPreAlloc = false;
+    else
+        AssertMsgRCReturn(rc, ("Configuration error: Failed to query integer \"RamPreAlloc\", rc=%Vrc.\n", rc), rc);
+
     uint64_t    cbRam;
-    bool        fPreAlloc = false;
-
-    int rc = CFGMR3QueryU64(CFGMR3GetRoot(pVM), "RamSize", &cbRam);
+    rc = CFGMR3QueryU64(CFGMR3GetRoot(pVM), "RamSize", &cbRam);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         cbRam = 0;
-
-    rc = CFGMR3QueryBool(CFGMR3GetRoot(pVM), "RamPreAlloc", &fPreAlloc);
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        fPreAlloc = false;
-
     if (VBOX_SUCCESS(rc) || rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
@@ -212 +212 @@
         }
 #ifdef PGM_DYNAMIC_RAM_ALLOC
-        Log(("MM: %llu bytes of RAM \n", cbRam));
+        Log(("MM: %llu bytes of RAM%s\n", cbRam, fPreAlloc ? " (PreAlloc)" : ""));
         pVM->mm.s.pvRamBaseHC = 0; /** @todo obsolete */
         pVM->mm.s.cbRamBase   = cbRam & PAGE_BASE_GC_MASK;
@@ -225 +225 @@
                 if (fPreAlloc)
                 {
-                    RTGCPHYS GCPhys = PGM_DYNAMIC_CHUNK_SIZE;
-
-                    for (;GCPhys < cbRam ; GCPhys+=PGM_DYNAMIC_CHUNK_SIZE)
+                    for (RTGCPHYS GCPhys = PGM_DYNAMIC_CHUNK_SIZE; GCPhys < cbRam; GCPhys += PGM_DYNAMIC_CHUNK_SIZE)
                     {
                         rc = PGM3PhysGrowRange(pVM, GCPhys);
@@ -449 +447 @@
         PSUPPAGE    pPhysPage = &pLockedMem->aPhysPages[0];
         for (unsigned c = cPages; c > 0; c--, pPhysPage++)
-            pPhysPage->uReserved = (unsigned)pLockedMem;
+            pPhysPage->uReserved = (RTHCUINTPTR)pLockedMem;
 
         /*