Changeset 30819 in vbox

Timestamp:

Jul 14, 2010 11:39:11 AM (14 years ago)

Author:

vboxsync

Message:

Introduce VBOX_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST for large guest memory support on 32-bit hosts

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -1250 +1250 @@
     AssertLogRelRCReturn(rc, rc);
 
-#if HC_ARCH_BITS == 64 || 1 /** @todo 4GB/32-bit: remove || 1 later and adjust the limit. */
+#ifdef VBOX_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
+    rc = CFGMR3QueryU32Def(pCfgPGM, "MaxRing3Chunks", &pVM->pgm.s.ChunkR3Map.cMax, _1G / GMM_CHUNK_SIZE);
+#else
     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);

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -3188 +3188 @@
 }
 
-#if 1 /* HC_ARCH_BITS == 32 */
+#ifdef VBOX_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
 /**
  * Tree enumeration callback for dealing with age rollover.
@@ -3433 +3433 @@
     AssertRC(rc);
 }
-#endif /* HC_ARCH_BITS == 32 */
+#endif /* VBOX_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST */
 
 /**
@@ -3499 +3499 @@
         if (pVM->pgm.s.ChunkR3Map.c >= pVM->pgm.s.ChunkR3Map.cMax)
         {
+#ifdef VBOX_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
             /* Postpone the unmap operation (which requires a rendezvous operation) as we own the PGM lock here. */
             rc = VMR3ReqCallNoWaitU(pVM->pUVM, VMCPUID_ANY_QUEUE, (PFNRT)pgmR3PhysUnmapChunk, 1, pVM);
             AssertRC(rc);
+#else
+            AssertFatalFailed();  /* can't happen */
+#endif
         }
     }