Changeset 107171 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 28, 2024 10:38:10 AM (7 weeks ago)

Author:

vboxsync

Message:

VMM/PGM: Introducing VBOX_WITH_ONLY_PGM_NEM_MODE to disable lots unused code on *.arm64 and darwin. jiraref:VBP-1466

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GMM.cpp (modified) (7 diffs)
• PGM-armv8.cpp (modified) (18 diffs)
• PGM.cpp (modified) (13 diffs)
• PGMDbg.cpp (modified) (4 diffs)
• PGMPhys.cpp (modified) (49 diffs)
• PGMSavedState.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/GMM.cpp

@@ -50 +50 @@
                                         GMMOCPOLICY enmPolicy, GMMPRIORITY enmPriority)
 {
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     if (!SUPR3IsDriverless())
     {
@@ -62 +63 @@
         return VMMR3CallR0(pVM, VMMR0_DO_GMM_INITIAL_RESERVATION, 0, &Req.Hdr);
     }
+#else
+    RT_NOREF(pVM, cBasePages, cShadowPages, cFixedPages, enmPolicy, enmPriority);
+#endif
     return VINF_SUCCESS;
 }
@@ -71 +75 @@
 GMMR3DECL(int)  GMMR3UpdateReservation(PVM pVM, uint64_t cBasePages, uint32_t cShadowPages, uint32_t cFixedPages)
 {
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     if (!SUPR3IsDriverless())
     {
@@ -81 +86 @@
         return VMMR3CallR0(pVM, VMMR0_DO_GMM_UPDATE_RESERVATION, 0, &Req.Hdr);
     }
+#else
+    RT_NOREF(pVM, cBasePages, cShadowPages, cFixedPages);
+#endif
     return VINF_SUCCESS;
 }
@@ -269 +277 @@
 }
 
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
 
 /**
@@ -432 +441 @@
 
 
-#if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
+# if defined(VBOX_STRICT) && HC_ARCH_BITS == 64
 /**
  * @see GMMR0FindDuplicatePage
@@ -450 +459 @@
     return false;
 }
-#endif /* VBOX_STRICT && HC_ARCH_BITS == 64 */
-
+# endif /* VBOX_STRICT && HC_ARCH_BITS == 64 */
+
+#endif /* defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0) */
+

trunk/src/VBox/VMM/VMMR3/PGM-armv8.cpp

@@ -72 +72 @@
 
 /*********************************************************************************************************************************
-*   Structures and Typedefs                                                                                                      *
-*********************************************************************************************************************************/
-
-
-/*********************************************************************************************************************************
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
@@ -101 +96 @@
 {
     AssertFatal(!PDMCritSectIsInitialized(&pVM->pgm.s.CritSectX));
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     pVM->pgm.s.fNemMode = true;
+#endif
 }
 
@@ -113 +110 @@
 VMMR3_INT_DECL(bool)    PGMR3IsNemModeEnabled(PVM pVM)
 {
-    return pVM->pgm.s.fNemMode;
+    RT_NOREF(pVM);
+    return PGM_IS_IN_NEM_MODE(pVM);
 }
 
@@ -126 +124 @@
 {
     LogFlow(("PGMR3Init:\n"));
-    PCFGMNODE pCfgPGM = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/PGM");
-    int rc;
 
     /*
@@ -136 +132 @@
     AssertCompileMemberAlignment(PGM, CritSectX, sizeof(uintptr_t));
 
-    /*
-     * If we're in driveless mode we have to use the simplified memory mode.
-     */
     bool const fDriverless = SUPR3IsDriverless();
-    AssertReturn(fDriverless, VERR_NOT_SUPPORTED);
-    if (!pVM->pgm.s.fNemMode)
-        pVM->pgm.s.fNemMode = true;
 
     /*
@@ -148 +138 @@
      */
     /*pVM->pgm.s.fRestoreRomPagesAtReset = false;*/
+
+    /* We always use the simplified memory mode on arm. */
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
+    pVM->pgm.s.fNemMode = true;
+#endif
 
     for (unsigned i = 0; i < RT_ELEMENTS(pVM->pgm.s.aHandyPages); i++)
@@ -168 +163 @@
     for (size_t i = 0; i < RT_ELEMENTS(pVM->pgm.s.aPhysHandlerTypes); i++)
     {
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
         if (fDriverless)
+#endif
             pVM->pgm.s.aPhysHandlerTypes[i].hType  = i | (RTRandU64() & ~(uint64_t)PGMPHYSHANDLERTYPE_IDX_MASK);
         pVM->pgm.s.aPhysHandlerTypes[i].enmKind    = PGMPHYSHANDLERKIND_INVALID;
@@ -183 +180 @@
 #endif
 
-    rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "RamPreAlloc", &pVM->pgm.s.fRamPreAlloc,
+    /*
+     * Read the configuration.
+     */
+    PCFGMNODE const pCfgPGM = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/PGM");
+
+    int rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "RamPreAlloc", &pVM->pgm.s.fRamPreAlloc,
 #ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
                             true
@@ -252 +254 @@
      */
     RT_ZERO(pVM->pgm.s.abZeroPg); /* paranoia */
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (fDriverless)
         pVM->pgm.s.HCPhysZeroPg = _4G - GUEST_PAGE_SIZE * 2 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
     AssertRelease(pVM->pgm.s.HCPhysZeroPg != NIL_RTHCPHYS);
     AssertRelease(pVM->pgm.s.HCPhysZeroPg != 0);
+#endif
 
     /*
@@ -262 +266 @@
      */
     ASMMemFill32(pVM->pgm.s.abMmioPg, sizeof(pVM->pgm.s.abMmioPg), 0xfeedface);
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (fDriverless)
         pVM->pgm.s.HCPhysMmioPg = _4G - GUEST_PAGE_SIZE * 3 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
@@ -267 +272 @@
     AssertRelease(pVM->pgm.s.HCPhysMmioPg != 0);
     pVM->pgm.s.HCPhysInvMmioPg = pVM->pgm.s.HCPhysMmioPg;
+#endif
 
     /*
@@ -282 +288 @@
     AssertLogRelMsgStmt(cAccessHandlers >= 32, ("cAccessHandlers=%#x, min 32\n", cAccessHandlers), cAccessHandlers = 32);
     AssertLogRelMsgStmt(cAccessHandlers <= _64K, ("cAccessHandlers=%#x, max 65536\n", cAccessHandlers), cAccessHandlers = _64K);
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     if (!fDriverless)
     {
@@ -291 +298 @@
     }
     else
+#endif
     {
         uint32_t       cbTreeAndBitmap = 0;
@@ -331 +339 @@
 
 /**
- * Ring-3 init finalizing.
+ * Ring-3 init finalizing (not required here).
  *
  * @returns VBox status code.
@@ -338 +346 @@
 VMMR3DECL(int) PGMR3InitFinalize(PVM pVM)
 {
-    /*
-     * Allocate memory if we're supposed to do that.
-     */
+    RT_NOREF(pVM);
     int rc = VINF_SUCCESS;
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (pVM->pgm.s.fRamPreAlloc)
         rc = pgmR3PhysRamPreAllocate(pVM);
+#endif
 
     //pgmLogState(pVM);
-    LogRel(("PGM: PGMR3InitFinalize: 4 MB PSE mask %RGp -> %Rrc\n", pVM->pgm.s.GCPhys4MBPSEMask, rc));
+    LogRel(("PGM: PGMR3InitFinalize done: %Rrc\n", rc));
     return rc;
 }
@@ -511 +519 @@
 VMMDECL(bool) PGMHasDirtyPages(PVM pVM)
 {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     return pVM->pgm.s.CTX_SUFF(pPool)->cDirtyPages != 0;
+#else
+    RT_NOREF(pVM);
+    return false;
+#endif
 }
 
@@ -730 +743 @@
 
     CPUMMODE enmCpuMode = CPUMGetGuestMode(pVCpu);
-    return   enmCpuMode == CPUMMODE_ARMV8_AARCH64
-           ? PGMMODE_VMSA_V8_64
-           : PGMMODE_VMSA_V8_32;
+    return enmCpuMode == CPUMMODE_ARMV8_AARCH64
+         ? PGMMODE_VMSA_V8_64
+         : PGMMODE_VMSA_V8_32;
 }
 
@@ -1000 +1013 @@
     return pgmGstPtWalk(pVCpu, GCPtr, pWalk, pGstWalk); /** @todo Always do full walk for now. */
 }
+

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -737 +737 @@
 {
     AssertFatal(!PDMCritSectIsInitialized(&pVM->pgm.s.CritSectX));
+# ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (!pVM->pgm.s.fNemMode)
     {
@@ -742 +743 @@
         pVM->pgm.s.fNemMode = true;
     }
+# endif
 }
 
@@ -753 +755 @@
 VMMR3_INT_DECL(bool)    PGMR3IsNemModeEnabled(PVM pVM)
 {
-    return pVM->pgm.s.fNemMode;
+    RT_NOREF(pVM);
+    return PGM_IS_IN_NEM_MODE(pVM);
 }
 
@@ -784 +787 @@
     {
 #ifdef VBOX_WITH_PGM_NEM_MODE
-        if (!pVM->pgm.s.fNemMode)
+# ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
+        if (!PGM_IS_IN_NEM_MODE(pVM))
         {
             LogRel(("PGM: Enabling NEM mode (driverless)\n"));
             pVM->pgm.s.fNemMode = true;
         }
+# endif
 #else
         return VMR3SetError(pVM->pUVM, VERR_SUP_DRIVERLESS, RT_SRC_POS,
@@ -954 +959 @@
      */
     RT_ZERO(pVM->pgm.s.abZeroPg); /* paranoia */
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (fDriverless)
         pVM->pgm.s.HCPhysZeroPg = _4G - GUEST_PAGE_SIZE * 2 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
@@ -959 +965 @@
     AssertRelease(pVM->pgm.s.HCPhysZeroPg != 0);
     Log(("HCPhysZeroPg=%RHp abZeroPg=%p\n", pVM->pgm.s.HCPhysZeroPg, pVM->pgm.s.abZeroPg));
+#endif
 
     /*
@@ -965 +972 @@
      */
     ASMMemFill32(pVM->pgm.s.abMmioPg, sizeof(pVM->pgm.s.abMmioPg), 0xfeedface);
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (fDriverless)
         pVM->pgm.s.HCPhysMmioPg = _4G - GUEST_PAGE_SIZE * 3 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
@@ -971 +979 @@
     pVM->pgm.s.HCPhysInvMmioPg = pVM->pgm.s.HCPhysMmioPg;
     Log(("HCPhysInvMmioPg=%RHp abMmioPg=%p\n", pVM->pgm.s.HCPhysMmioPg, pVM->pgm.s.abMmioPg));
+#endif VBOX_WITH_ONLY_PGM_NEM_MODE
+
 
     /*
@@ -986 +996 @@
     AssertLogRelMsgStmt(cAccessHandlers >= 32, ("cAccessHandlers=%#x, min 32\n", cAccessHandlers), cAccessHandlers = 32);
     AssertLogRelMsgStmt(cAccessHandlers <= _64K, ("cAccessHandlers=%#x, max 65536\n", cAccessHandlers), cAccessHandlers = _64K);
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     if (!fDriverless)
     {
@@ -995 +1006 @@
     }
     else
+#endif
     {
         uint32_t       cbTreeAndBitmap = 0;
@@ -1772 +1784 @@
      */
     int rc = VINF_SUCCESS;
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (pVM->pgm.s.fRamPreAlloc)
         rc = pgmR3PhysRamPreAllocate(pVM);
+#endif
 
     //pgmLogState(pVM);
@@ -2338 +2352 @@
     }
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     Assert(pVCpu->pgm.s.pShwPageCR3R3 == NULL);
+#endif
     return rc;
 }
@@ -2358 +2374 @@
     AssertRCSuccessReturn(rc, VERR_IPE_UNEXPECTED_INFO_STATUS);
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     Assert(pVCpu->pgm.s.pShwPageCR3R3 != NULL || pVCpu->pgm.s.enmShadowMode == PGMMODE_NONE);
+#endif
     AssertMsg(   pVCpu->pgm.s.enmShadowMode >= PGMMODE_NESTED_32BIT
               || CPUMGetHyperCR3(pVCpu) == PGMGetHyperCR3(pVCpu),

trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp

@@ -1289 +1289 @@
 }
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
 
 /**
@@ -2214 +2215 @@
 }
 
+#endif /* !VBOX_WITH_ONLY_PGM_NEM_MODE */
+
 
 /**
@@ -2237 +2240 @@
     AssertReturn(fFlags & DBGFPGDMP_FLAGS_SHADOW, VERR_INVALID_PARAMETER);
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     PGMR3DUMPHIERARCHYSTATE State;
     pgmR3DumpHierarchyInitState(&State, pVM, fFlags, u64FirstAddr, u64LastAddr, pHlp);
@@ -2243 +2247 @@
     PGM_UNLOCK(pVM);
     return rc;
+#else
+    RT_NOREF(pVM, cr3, fFlags, u64FirstAddr, u64LastAddr, cMaxDepth, pHlp);
+    return VINF_SUCCESS;
+#endif
 }
 

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -1595 +1595 @@
                     PGMPAGETYPE enmNewType)
 {
+    RT_NOREF(enmNewType, pcPendingPages);
+
     /*
      * Assert sanity.
@@ -1625 +1627 @@
         return VMSetError(pVM, VERR_PGM_PHYS_INVALID_PAGE_ID, RT_SRC_POS, "GCPhys=%RGp idPage=%#x", GCPhys, pPage);
     }
-#ifdef VBOX_WITH_NATIVE_NEM
+#if defined(VBOX_WITH_NATIVE_NEM) && !defined(VBOX_WITH_ONLY_PGM_NEM_MODE)
     const RTHCPHYS HCPhysPrev = PGM_PAGE_GET_HCPHYS(pPage);
 #endif
@@ -1658 +1660 @@
     IEMTlbInvalidateAllPhysicalAllCpus(pVM, NIL_VMCPUID, IEMTLBPHYSFLUSHREASON_FREED); /// @todo move to the perform step.
 
-#ifdef VBOX_WITH_PGM_NEM_MODE
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
+# ifdef VBOX_WITH_PGM_NEM_MODE
     /*
      * Skip the rest if we're doing a bulk free in NEM memory mode.
@@ -1665 +1668 @@
         return VINF_SUCCESS;
     AssertLogRelReturn(!pVM->pgm.s.fNemMode, VERR_PGM_NOT_SUPPORTED_FOR_NEM_MODE);
-#endif
-
-#ifdef VBOX_WITH_NATIVE_NEM
+# endif
+
+# ifdef VBOX_WITH_NATIVE_NEM
     /* Notify NEM. */
     /** @todo Remove this one? */
@@ -1677 +1680 @@
         PGM_PAGE_SET_NEM_STATE(pPage, u2State);
     }
-#else
-    RT_NOREF(enmNewType);
-#endif
+# endif
 
     /*
@@ -1722 +1723 @@
     }
     return rc;
-}
-
-
-/**
- * Frees a range of pages, replacing them with ZERO pages of the specified type.
+
+#else  /* VBOX_WITH_ONLY_PGM_NEM_MODE */
+    Assert(!pReq); RT_NOREF(pReq);
+    return VINF_SUCCESS;
+#endif /* VBOX_WITH_ONLY_PGM_NEM_MODE */
+}
+
+
+/**
+ * Frees a range of pages, replacing them with MMIO ZERO pages.
  *
  * @returns VBox status code.
@@ -1739 +1745 @@
 {
     PGM_LOCK_ASSERT_OWNER(pVM);
+    /** @todo pvMmio2 is always NULL. */
 
 #ifdef VBOX_WITH_PGM_NEM_MODE
@@ -1745 +1752 @@
      * we just unmap it and let NEM do any unlocking of it.
      */
+# ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (pVM->pgm.s.fNemMode)
+# endif
     {
         Assert(VM_IS_NEM_ENABLED(pVM) || VM_IS_EXEC_ENGINE_IEM(pVM));
@@ -1777 +1786 @@
     RT_NOREF(pvMmio2);
 #endif /* !VBOX_WITH_PGM_NEM_MODE */
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
 
     /*
@@ -1787 +1797 @@
     AssertLogRelRCReturn(rc, rc);
 
-#ifdef VBOX_WITH_NATIVE_NEM
+# ifdef VBOX_WITH_NATIVE_NEM
     /* Tell NEM up-front. */
     uint8_t u2State = UINT8_MAX;
@@ -1797 +1807 @@
         AssertLogRelRCReturnStmt(rc, GMMR3FreePagesCleanup(pReq), rc);
     }
-#endif
+# endif
 
     /* Iterate the pages. */
@@ -1808 +1818 @@
 
         PGM_PAGE_SET_TYPE(pVM, pPageDst, PGMPAGETYPE_MMIO);
-#ifdef VBOX_WITH_NATIVE_NEM
+# ifdef VBOX_WITH_NATIVE_NEM
         if (u2State != UINT8_MAX)
             PGM_PAGE_SET_NEM_STATE(pPageDst, u2State);
-#endif
+# endif
 
         GCPhys += GUEST_PAGE_SIZE;
@@ -1826 +1836 @@
 
     return rc;
+#endif /* !VBOX_WITH_ONLY_PGM_NEM_MODE */
 }
 
@@ -1837 +1848 @@
     PGMPHYSALLOCATERAMRANGEREQ AllocRangeReq;
     AllocRangeReq.idNewRange   = UINT32_MAX / 4;
-    if (SUPR3IsDriverless())
-        rc = pgmPhysRamRangeAllocCommon(pVM, cGuestPages, fFlags, &AllocRangeReq.idNewRange);
-    else
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
+    if (!SUPR3IsDriverless())
     {
         AllocRangeReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
@@ -1848 +1858 @@
         rc = VMMR3CallR0Emt(pVM, pVCpu, VMMR0_DO_PGM_PHYS_ALLOCATE_RAM_RANGE, 0 /*u64Arg*/, &AllocRangeReq.Hdr);
     }
+    else
+#endif
+        rc = pgmPhysRamRangeAllocCommon(pVM, cGuestPages, fFlags, &AllocRangeReq.idNewRange);
     if (RT_SUCCESS(rc))
     {
@@ -1857 +1870 @@
     }
 
+    RT_NOREF(pVCpu);
     *ppRamRange = NULL;
     return rc;
@@ -1890 +1904 @@
     uint32_t const cPages = pNew->cb >> GUEST_PAGE_SHIFT;
 #ifdef VBOX_WITH_PGM_NEM_MODE
-    if (!pVM->pgm.s.fNemMode)
-#endif
+    if (PGM_IS_IN_NEM_MODE(pVM))
     {
         RTGCPHYS iPage = cPages;
@@ -1901 +1914 @@
         pVM->pgm.s.cAllPages  += cPages;
     }
-#ifdef VBOX_WITH_PGM_NEM_MODE
     else
-    {
+#endif
+    {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
         int rc = SUPR3PageAlloc(RT_ALIGN_Z(pNew->cb, HOST_PAGE_SIZE) >> HOST_PAGE_SHIFT,
                                 pVM->pgm.s.fUseLargePages ? SUP_PAGE_ALLOC_F_LARGE_PAGES : 0, (void **)&pNew->pbR3);
@@ -1917 +1931 @@
         pVM->pgm.s.cPrivatePages += cPages;
         pVM->pgm.s.cAllPages     += cPages;
-    }
-#endif
+#endif
+    }
 
     /*
@@ -2092 +2106 @@
 
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
 /**
  * Worker called by PGMR3InitFinalize if we're configured to pre-allocate RAM.
@@ -2106 +2121 @@
     Assert(pVM->pgm.s.fRamPreAlloc);
     Log(("pgmR3PhysRamPreAllocate: enter\n"));
-#ifdef VBOX_WITH_PGM_NEM_MODE
-    AssertLogRelReturn(!pVM->pgm.s.fNemMode, VERR_PGM_NOT_SUPPORTED_FOR_NEM_MODE);
-#endif
+# ifdef VBOX_WITH_PGM_NEM_MODE
+    if (VM_IS_NEM_ENABLED(pVM))
+    {
+        LogRel(("PGM: Pre-alloc ignored in NEM mode.\n"));
+        return VINF_SUCCESS;
+    }
+# endif
 
     /*
@@ -2168 +2187 @@
     return VINF_SUCCESS;
 }
+#endif /* !VBOX_WITH_ONLY_PGM_NEM_MODE */
 
 
@@ -2248 +2268 @@
     PGM_LOCK_ASSERT_OWNER(pVM);
 
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     /* Reset the memory balloon. */
-    int rc = GMMR3BalloonedPages(pVM, GMMBALLOONACTION_RESET, 0);
-    AssertRC(rc);
+    int rc1 = GMMR3BalloonedPages(pVM, GMMBALLOONACTION_RESET, 0);
+    AssertRC(rc1);
+#endif
 
 #ifdef VBOX_WITH_PAGE_SHARING
     /* Clear all registered shared modules. */
     pgmR3PhysAssertSharedPageChecksums(pVM);
-    rc = GMMR3ResetSharedModules(pVM);
-    AssertRC(rc);
+    int rc2 = GMMR3ResetSharedModules(pVM);
+    AssertRC(rc2);
 #endif
     /* Reset counters. */
@@ -2301 +2323 @@
         AssertMsg(((RTGCPHYS)iPage << GUEST_PAGE_SHIFT) == pRam->cb, ("%RGp %RGp\n", (RTGCPHYS)iPage << GUEST_PAGE_SHIFT, pRam->cb));
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
         if (   !pVM->pgm.s.fRamPreAlloc
-#ifdef VBOX_WITH_PGM_NEM_MODE
+# ifdef VBOX_WITH_PGM_NEM_MODE
             && !pVM->pgm.s.fNemMode
-#endif
+# endif
             && pVM->pgm.s.fZeroRamPagesOnReset)
         {
@@ -2354 +2377 @@
         }
         else
+#endif /* !VBOX_WITH_ONLY_PGM_NEM_MODE */
+
         {
             /* Zero the memory. */
@@ -2438 +2463 @@
 int pgmR3PhysRamTerm(PVM pVM)
 {
+    int rc;
     PGM_LOCK_ASSERT_OWNER(pVM);
 
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     /* Reset the memory balloon. */
-    int rc = GMMR3BalloonedPages(pVM, GMMBALLOONACTION_RESET, 0);
+    rc = GMMR3BalloonedPages(pVM, GMMBALLOONACTION_RESET, 0);
     AssertRC(rc);
+#endif
 
 #ifdef VBOX_WITH_PAGE_SHARING
+
     /*
      * Clear all registered shared modules.
@@ -3280 +3309 @@
          * and maybe a ring-0 mapping address for it all.
          */
-        if (SUPR3IsDriverless())
-            rc = pgmPhysMmio2RegisterWorker(pVM, cGuestPages, idMmio2, cChunks, pDevIns, iSubDev, iRegion, fFlags);
-        else
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
+        if (!SUPR3IsDriverless())
         {
             PGMPHYSMMIO2REGISTERREQ Mmio2RegReq;
@@ -3297 +3325 @@
             rc = VMMR3CallR0Emt(pVM, pVCpu, VMMR0_DO_PGM_PHYS_MMIO2_REGISTER, 0 /*u64Arg*/, &Mmio2RegReq.Hdr);
         }
+        else
+#endif
+            rc = pgmPhysMmio2RegisterWorker(pVM, cGuestPages, idMmio2, cChunks, pDevIns, iSubDev, iRegion, fFlags);
         if (RT_SUCCESS(rc))
         {
@@ -3451 +3482 @@
             const char * const pszDesc = pVM->pgm.s.apMmio2RamRanges[idx] ? pVM->pgm.s.apMmio2RamRanges[idx]->pszDesc : NULL;
             int rc2;
-            if (SUPR3IsDriverless())
-            {
-                Assert(PGM_IS_IN_NEM_MODE(pVM));
-                rc2 = pgmPhysMmio2DeregisterWorker(pVM, idx, cChunks, pDevIns);
-                AssertLogRelMsgStmt(RT_SUCCESS(rc2),
-                                    ("pgmPhysMmio2DeregisterWorker: rc=%Rrc idx=%#x cChunks=%#x %s\n",
-                                     rc2, idx, cChunks, pszDesc),
-                                    rc = RT_SUCCESS(rc) ? rc2 : rc);
-            }
-            else
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
+            if (!SUPR3IsDriverless())
             {
                 PGMPHYSMMIO2DEREGISTERREQ Mmio2DeregReq;
@@ -3475 +3498 @@
                 pgmPhysInvalidRamRangeTlbs(pVM); /* Ensure no stale pointers in the ring-3 RAM range TLB. */
             }
+            else
+#endif
+            {
+                Assert(PGM_IS_IN_NEM_MODE(pVM));
+                rc2 = pgmPhysMmio2DeregisterWorker(pVM, idx, cChunks, pDevIns);
+                AssertLogRelMsgStmt(RT_SUCCESS(rc2),
+                                    ("pgmPhysMmio2DeregisterWorker: rc=%Rrc idx=%#x cChunks=%#x %s\n",
+                                     rc2, idx, cChunks, pszDesc),
+                                    rc = RT_SUCCESS(rc) ? rc2 : rc);
+            }
             if (RT_FAILURE(rc2))
             {
@@ -3614 +3647 @@
             Assert(PGM_PAGE_IS_MMIO(pPageDst));
 
-            RTHCPHYS const HCPhys = PGM_PAGE_GET_HCPHYS(pPageSrc);
+            RTHCPHYS const HCPhys = PGM_PAGE_GET_HCPHYS(pPageSrc); RT_NOREF_PV(HCPhys);
             uint32_t const idPage = PGM_PAGE_GET_PAGEID(pPageSrc);
             PGM_PAGE_SET_PAGEID(pVM, pPageDst, idPage);
@@ -4699 +4732 @@
 #endif
     {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
         rc = GMMR3AllocatePagesPrepare(pVM, &pReq, cGuestPages, GMMACCOUNT_BASE);
         AssertRCReturn(rc, rc);
@@ -4716 +4750 @@
             return rc;
         }
+#endif
     }
 
@@ -4732 +4767 @@
          * Note! We don't clean up the ROM range here on failure, VM destruction does that.
          */
-        if (SUPR3IsDriverless())
-            rc = pgmPhysRomRangeAllocCommon(pVM, cGuestPages, idRomRange, fFlags);
-        else
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
+        if (!SUPR3IsDriverless())
         {
             PGMPHYSROMALLOCATERANGEREQ RomRangeReq;
@@ -4745 +4779 @@
             rc = VMMR3CallR0Emt(pVM, pVCpu, VMMR0_DO_PGM_PHYS_ROM_ALLOCATE_RANGE, 0 /*u64Arg*/, &RomRangeReq.Hdr);
         }
+        else
+#endif
+            rc = pgmPhysRomRangeAllocCommon(pVM, cGuestPages, idRomRange, fFlags);
     }
     if (RT_SUCCESS(rc))
@@ -4779 +4816 @@
 #endif
             {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
                 Assert(!pRamRange->pbR3); Assert(!pvRam);
                 for (uint32_t iPage = 0; iPage < cGuestPages; iPage++, pRamPage++, pRomPage++)
@@ -4790 +4828 @@
                     pRomPage->Virgin = *pRamPage;
                 }
+#endif
             }
 
@@ -4822 +4861 @@
 #endif
             {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
                 for (uint32_t iPage = 0; iPage < cGuestPages; iPage++, pRamPage++, pRomPage++)
                 {
@@ -4836 +4876 @@
                 pVM->pgm.s.cZeroPages    -= cGuestPages;
                 pVM->pgm.s.cPrivatePages += cGuestPages;
+#endif
             }
             pRamRange = pOverlappingRange;
@@ -5001 +5042 @@
 #endif
             {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
                 for (uint32_t iPage = 0; iPage < cGuestPages; iPage++, pRamPage++)
                     PGM_PAGE_INIT_ZERO(pRamPage, pVM, PGMPAGETYPE_RAM);
                 pVM->pgm.s.cZeroPages    += cGuestPages;
                 pVM->pgm.s.cPrivatePages -= cGuestPages;
+#endif
             }
         }
@@ -5023 +5066 @@
 #endif
     {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
         GMMR3FreeAllocatedPages(pVM, pReq);
         GMMR3AllocatePagesCleanup(pReq);
+#endif
     }
 
@@ -5116 +5161 @@
                 RT_BZERO(pRom->pbR3Alternate, pRom->cb);
             }
+# ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
             else
-#endif
+# endif
+#endif
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
             if (!pVM->pgm.s.fRamPreAlloc)
             {
@@ -5161 +5209 @@
                 AssertRCReturn(rc, rc);
             }
+#endif
         }
 
@@ -5398 +5447 @@
     unsigned            cPages          = paUser[1];
     RTGCPHYS           *paPhysPage      = (RTGCPHYS *)paUser[2];
-    uint32_t            cPendingPages   = 0;
-    PGMMFREEPAGESREQ    pReq;
-    int                 rc;
+    int                 rc              = VINF_SUCCESS;
 
     Log(("pgmR3PhysChangeMemBalloonRendezvous: %s %x pages\n", (fInflate) ? "inflate" : "deflate", cPages));
@@ -5411 +5458 @@
 
         /* Replace pages with ZERO pages. */
+        uint32_t         cPendingPages   = 0;
+        PGMMFREEPAGESREQ pReq            = NULL;
         rc = GMMR3FreePagesPrepare(pVM, &pReq, PGMPHYS_FREE_PAGE_BATCH_SIZE, GMMACCOUNT_BASE);
         if (RT_FAILURE(rc))
@@ -5477 +5526 @@
     }
 
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     /* Notify GMM about the balloon change. */
     rc = GMMR3BalloonedPages(pVM, (fInflate) ? GMMBALLOONACTION_INFLATE : GMMBALLOONACTION_DEFLATE, cPages);
@@ -5489 +5539 @@
             pVM->pgm.s.cBalloonedPages += cPages;
     }
+#endif
 
     PGM_UNLOCK(pVM);
@@ -5700 +5751 @@
     uint64_t cBalloonPages = 0;
     uint64_t cSharedPages  = 0;
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     if (!SUPR3IsDriverless())
     {
@@ -5705 +5757 @@
         AssertRCReturn(rc, rc);
     }
+#endif
 
     if (pcbAllocMem)

trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp

@@ -3222 +3222 @@
         rc = pgmR3LoadMemoryOld(pVM, pSSM, uVersion);
 
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     /* Refresh balloon accounting. */
     if (pVM->pgm.s.cBalloonedPages)
@@ -3229 +3230 @@
         AssertRCReturn(rc, rc);
     }
+#endif
     return rc;
 }