Changeset 6535 in vbox

Timestamp:

Jan 28, 2008 7:16:04 PM (17 years ago)

Author:

vboxsync

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

27562

Message:

MM::cbRAMSize -> MM:cbRamRegistered. Drop MM:pvRamBaseHC. Drop VBOX_WITH_PREALLOC_RAM_BY_DEFAULT.

Location:

trunk/src/VBox/VMM

Files:

• MM.cpp (modified) (5 diffs)
• MMInternal.h (modified) (1 diff)
• MMPhys.cpp (modified) (2 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/MM.cpp

@@ -187 +187 @@
 {
     LogFlow(("MMR3InitPaging:\n"));
-    bool        fPreAlloc;
+
+    /*
+     * Query the CFGM values.
+     */
+    bool fPreAlloc;
     int rc = CFGMR3QueryBool(CFGMR3GetRoot(pVM), "RamPreAlloc", &fPreAlloc);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-#ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
-        fPreAlloc = true;
-#else
         fPreAlloc = false;
-#endif
     else
         AssertMsgRCReturn(rc, ("Configuration error: Failed to query integer \"RamPreAlloc\", rc=%Vrc.\n", rc), rc);
 
-    uint64_t    cbRam;
+    uint64_t cbRam;
     rc = CFGMR3QueryU64(CFGMR3GetRoot(pVM), "RamSize", &cbRam);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         cbRam = 0;
-    if (VBOX_SUCCESS(rc) || rc == VERR_CFGM_VALUE_NOT_FOUND)
+    if (    RT_SUCCESS(rc)
+        ||  rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
         if (cbRam < PAGE_SIZE)
@@ -209 +210 @@
             return VINF_SUCCESS;
         }
+
+        /*
+         * Register the memory.
+         */
         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;
-        rc = MMR3PhysRegister(pVM, pVM->mm.s.pvRamBaseHC, 0, pVM->mm.s.cbRamBase, MM_RAM_FLAGS_DYNAMIC_ALLOC, "Main Memory");
-        if (VBOX_SUCCESS(rc))
+        pVM->mm.s.cbRamBase = cbRam & X86_PTE_PAE_PG_MASK;
+        rc = MMR3PhysRegister(pVM, NULL, 0, pVM->mm.s.cbRamBase, MM_RAM_FLAGS_DYNAMIC_ALLOC, "Main Memory");
+        if (RT_SUCCESS(rc))
         {
-            /* Allocate the first chunk, as we'll map ROM ranges there. */
+            /*
+             * Allocate the first chunk, as we'll map ROM ranges there.
+             * If requested, allocated the rest too.
+             */
             rc = PGM3PhysGrowRange(pVM, (RTGCPHYS)0);
-            if (VBOX_SUCCESS(rc))
-            {
-                /* Should we preallocate the entire guest RAM? */
-                if (fPreAlloc)
-                {
-                    for (RTGCPHYS GCPhys = PGM_DYNAMIC_CHUNK_SIZE; GCPhys < cbRam; GCPhys += PGM_DYNAMIC_CHUNK_SIZE)
-                    {
-                        rc = PGM3PhysGrowRange(pVM, GCPhys);
-                        if (VBOX_FAILURE(rc))
-                            return rc;
-                    }
-                }
-                return rc;
-            }
+            if (RT_SUCCESS(rc) && fPreAlloc)
+                for (RTGCPHYS GCPhys = PGM_DYNAMIC_CHUNK_SIZE;
+                     GCPhys < cbRam && RT_SUCCESS(rc);
+                     GCPhys += PGM_DYNAMIC_CHUNK_SIZE)
+                    rc = PGM3PhysGrowRange(pVM, GCPhys);
         }
     }
@@ -347 +345 @@
 
     /* (PGM saves the physical memory.) */
-    SSMR3PutUInt(pSSM, pVM->mm.s.cbRAMSize);
+    SSMR3PutUInt(pSSM, pVM->mm.s.cbRamRegistered);
     return SSMR3PutUInt(pSSM, pVM->mm.s.cbRamBase);
 }
@@ -374 +372 @@
 
     /*
-     * Check the cbRAMSize and cbRamBase values.
+     * Check the cbRamRegistered and cbRamBase values.
      */
     RTUINT  cb;
@@ -380 +378 @@
     if (VBOX_FAILURE(rc))
         return rc;
-    if (cb != pVM->mm.s.cbRAMSize)
-    {
-        Log(("mmR3Load: Memory configuration has changed. cbRAMSize=%#x save %#x\n", pVM->mm.s.cbRAMSize, cb));
+    if (cb != pVM->mm.s.cbRamRegistered)
+    {
+        Log(("mmR3Load: Memory configuration has changed. cbRamRegistered=%#x save %#x\n", pVM->mm.s.cbRamRegistered, cb));
         return VERR_SSM_LOAD_MEMORY_SIZE_MISMATCH;
     }

trunk/src/VBox/VMM/MMInternal.h

@@ -662 +662 @@
     /** Size of the currently allocated guest RAM.
      * Mark that this is the actual size, not the end address. */
-    RTUINT                      cbRAMSize;
+    RTUINT                      cbRamRegistered;
     /** Size of the base RAM in bytes. */
     RTUINT                      cbRamBase;
-    /** Pointer to the base RAM. */
-    R3PTRTYPE(void *)           pvRamBaseHC;
     /** The head of the ROM ranges. */
     R3PTRTYPE(PMMROMRANGE)      pRomHead;

trunk/src/VBox/VMM/MMPhys.cpp

@@ -132 +132 @@
         {
             if (fFlags == MM_RAM_FLAGS_DYNAMIC_ALLOC)
-                pVM->mm.s.cbRAMSize += cb;
+                pVM->mm.s.cbRamRegistered += cb;
 
             REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, pvRam, fFlags);
@@ -165 +165 @@
                 {
                     if (!fFlags)
-                        pVM->mm.s.cbRAMSize += cb;
+                        pVM->mm.s.cbRamRegistered += cb;
 
                     REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, pvRam, fFlags);

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -182 +182 @@
     GEN_CHECK_OFF(MM, pvDummyPage);
     GEN_CHECK_OFF(MM, HCPhysDummyPage);
-    GEN_CHECK_OFF(MM, cbRAMSize);
-    GEN_CHECK_OFF(MM, pvRamBaseHC);
+    GEN_CHECK_OFF(MM, cbRamRegistered);
     GEN_CHECK_OFF(MM, cbRamBase);
     GEN_CHECK_OFF(MM, pHeap);