Changeset 6830 in vbox

Timestamp:

Feb 6, 2008 2:30:13 PM (17 years ago)

Author:

vboxsync

Message:

Used PGMR3PhysRegisterRam.

Location:

trunk/src/VBox/VMM

Files:

• MM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/MM.cpp

@@ -314 +314 @@
     }
 
+    /*
+     * Setup the base ram (PGM).
+     */
+    rc = PGMR3PhysRegisterRam(pVM, 0, cbRam, "Base RAM");
 #ifdef VBOX_WITH_NEW_PHYS_CODE
-    /*
-     * Setup the base ram (PGM).
-     */
-    rc = PGMR3PhysRegisterRam(pVM, 0, cbRam, "Base RAM");
     if (RT_SUCCESS(rc) && fPreAlloc)
     {
-        /** @todo implement RamPreAlloc if it is *really* needed - in PGM preferably. (lazy bird) */
+        /** @todo RamPreAlloc should be handled at the very end of the VM creation. (lazy bird) */
         return VM_SET_ERROR(pVM, VERR_NOT_IMPLEMENTED, "TODO: RamPreAlloc");
     }
-
 #else
-    rc = MMR3PhysRegisterEx(pVM, NULL, 0, cbRam, MM_RAM_FLAGS_DYNAMIC_ALLOC, MM_PHYS_TYPE_NORMAL, "Main Memory");
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -145 +145 @@
     pNew->pvHC          = NULL;
 
+#ifndef VBOX_WITH_NEW_PHYS_CODE
+    /* Allocate memory for chunk to HC ptr lookup array. */
+    rc = MMHyperAlloc(pVM, (cb >> PGM_DYNAMIC_CHUNK_SHIFT) * sizeof(void *), 16, MM_TAG_PGM, (void **)&pNew->pavHCChunkHC);
+    AssertRCReturn(rc, rc);
+    pNew->pavHCChunkGC = MMHyperCCToGC(pVM, pNew->pavHCChunkHC);
+    pNew->fFlags |= MM_RAM_FLAGS_DYNAMIC_ALLOC;
+
+#endif
     RTGCPHYS iPage = cPages;
     while (iPage-- > 0)
     {
+#ifdef VBOX_WITH_NEW_PHYS_CODE
         pNew->aPages[iPage].HCPhys = pVM->pgm.s.HCPhysZeroPg;
+#else
+        pNew->aPages[iPage].HCPhys = 0;
+#endif
         pNew->aPages[iPage].u2State = PGM_PAGE_STATE_ZERO;
         pNew->aPages[iPage].fWrittenTo = 0;
@@ -177 +189 @@
     }
     pgmUnlock(pVM);
+
+    /*
+     * Notify REM.
+     */
+#ifdef VBOX_WITH_NEW_PHYS_CODE
+    REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, 0);
+#else
+    REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, MM_RAM_FLAGS_DYNAMIC_ALLOC);
+#endif
 
     return VINF_SUCCESS;