Changeset 91852 in vbox for trunk

Timestamp:

Oct 19, 2021 11:34:50 PM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM,PGM: Build fixes. bugref:10122

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllHandler.cpp (modified) (1 diff)
• VMMR3/PGMPhys.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp

@@ -435 +435 @@
 int pgmHandlerPhysicalExDeregister(PVMCC pVM, PPGMPHYSHANDLER pPhysHandler)
 {
-    LogFlow(("pgmHandlerPhysicalExDeregister: Removing Range %RGp-%RGp %s fRestoreAsRAM=%d\n",
+    LogFlow(("pgmHandlerPhysicalExDeregister: Removing Range %RGp-%RGp %s\n",
              pPhysHandler->Core.Key, pPhysHandler->Core.KeyLast, R3STRING(pPhysHandler->pszDesc)));
     AssertReturn(pPhysHandler->Core.Key != NIL_RTGCPHYS, VERR_PGM_HANDLER_NOT_FOUND);

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

@@ -1762 +1762 @@
     pgmR3PhysLinkRamRange(pVM, pNew, pPrev);
 
+#ifdef VBOX_WITH_NATIVE_NEM
     /*
      * Notify NEM now that it has been linked.
@@ -1769 +1770 @@
         pgmR3PhysUnlinkRamRange2(pVM, pNew, pPrev);
     return rc;
+#else
+    return VINF_SUCCESS;
+#endif
 }
 
@@ -5688 +5692 @@
         return VMSetError(pVM, VERR_PGM_PHYS_INVALID_PAGE_ID, RT_SRC_POS, "GCPhys=%RGp idPage=%#x", GCPhys, pPage);
     }
+#ifdef VBOX_WITH_PGM_NEM_MODE
     const RTHCPHYS HCPhysPrev = PGM_PAGE_GET_HCPHYS(pPage);
+#endif
 
     /* update page count stats. */