vbox的更動 17371 路徑 trunk/src/VBox/VMM/PGM.cpp

時間撮記:

2009-3-5 上午01:37:58 (16 年 以前)

作者:

vboxsync

訊息:

PGM,GMM: Hacking on the new phys code.

檔案:

• trunk/src/VBox/VMM/PGM.cpp (修改) (5 筆差異)

trunk/src/VBox/VMM/PGM.cpp

@@ -1160 +1160 @@
 {
     LogFlow(("PGMR3Init:\n"));
+    PCFGMNODE pCfgPGM = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/PGM");
+    int rc;
 
     /*
@@ -1169 +1171 @@
      * Init the structure.
      */
-    pVM->pgm.s.offVM = RT_OFFSETOF(VM, pgm.s);
-    pVM->pgm.s.offVCpu = RT_OFFSETOF(VMCPU, pgm.s);
+    pVM->pgm.s.offVM            = RT_OFFSETOF(VM, pgm.s);
+    pVM->pgm.s.offVCpu          = RT_OFFSETOF(VMCPU, pgm.s);
     pVM->pgm.s.enmShadowMode    = PGMMODE_INVALID;
     pVM->pgm.s.enmGuestMode     = PGMMODE_INVALID;
@@ -1196 +1198 @@
     }
 
-#ifdef VBOX_STRICT
-    VMR3AtStateRegister(pVM, pgmR3ResetNoMorePhysWritesFlag, NULL);
-#endif
-    PGMRegisterStringFormatTypes();
+    rc = CFGMR3QueryBoolDef(pCfgPGM, "RamPreAlloc", &pVM->pgm.s.fRamPreAlloc, false);
+    AssertLogRelRCReturn(rc, rc);
+
+#if HC_ARCH_BITS == 64
+    rc = CFGMR3QueryU32Def(pCfgPGM, "MaxRing3Chunks", &pVM->pgm.s.ChunkR3Map.cMax, UINT32_MAX);
+#else
+    rc = CFGMR3QueryU32Def(pCfgPGM, "MaxRing3Chunks", &pVM->pgm.s.ChunkR3Map.cMax, _1G / GMM_CHUNK_SIZE);
+#endif
+    AssertLogRelRCReturn(rc, rc);
+    for (uint32_t i = 0; i < RT_ELEMENTS(pVM->pgm.s.ChunkR3Map.Tlb.aEntries); i++)
+        pVM->pgm.s.ChunkR3Map.Tlb.aEntries[i].idChunk = NIL_GMM_CHUNKID;
 
     /*
@@ -1205 +1214 @@
      */
     uint64_t    cbRam;
-    int rc = CFGMR3QueryU64(CFGMR3GetRoot(pVM), "RamSize", &cbRam);
+    rc = CFGMR3QueryU64(CFGMR3GetRoot(pVM), "RamSize", &cbRam);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         cbRam = pVM->pgm.s.cbRamSize = 0;
@@ -1222 +1231 @@
 
     /*
-     * Register saved state data unit.
-     */
+     * Register callbacks, string formatters and the saved state data unit.
+     */
+#ifdef VBOX_STRICT
+    VMR3AtStateRegister(pVM, pgmR3ResetNoMorePhysWritesFlag, NULL);
+#endif
+    PGMRegisterStringFormatTypes();
+
     rc = SSMR3RegisterInternal(pVM, "pgm", 1, PGM_SAVED_STATE_VERSION, (size_t)cbRam + sizeof(PGM),
                                NULL, pgmR3Save, NULL,