Changeset 40274 in vbox for trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

Timestamp:

Feb 28, 2012 1:17:35 PM (13 years ago)

Author:

vboxsync

Message:

Introduced VBOX_WITH_REM in Config.kmk and the VMM.

File:

• trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (10 diffs)

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

@@ -25 +25 @@
 #include <VBox/vmm/mm.h>
 #include <VBox/vmm/stam.h>
-#include <VBox/vmm/rem.h>
+#ifdef VBOX_WITH_REM
+# include <VBox/vmm/rem.h>
+#endif
 #include <VBox/vmm/pdmdev.h>
 #include "PGMInternal.h"
@@ -1734 +1736 @@
     pgmUnlock(pVM);
 
+#ifdef VBOX_WITH_REM
     /*
      * Notify REM.
      */
     REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, REM_NOTIFY_PHYS_RAM_FLAGS_RAM);
+#endif
 
     return VINF_SUCCESS;
@@ -2754 +2758 @@
         pgmUnlock(pVM);
 
+#ifdef VBOX_WITH_REM
         REMR3NotifyPhysRamRegister(pVM, GCPhys, cb, REM_NOTIFY_PHYS_RAM_FLAGS_MMIO2);
+#endif
     }
 
@@ -2795 +2801 @@
     pgmLock(pVM);
 
+#ifdef VBOX_WITH_REM
     RTGCPHYS    GCPhysRangeREM;
     RTGCPHYS    cbRangeREM;
     bool        fInformREM;
+#endif
     if (pCur->fOverlapping)
     {
@@ -2816 +2824 @@
         /* Flush physical page map TLB. */
         pgmPhysInvalidatePageMapTLB(pVM);
-
+#ifdef VBOX_WITH_REM
         GCPhysRangeREM = NIL_RTGCPHYS;  /* shuts up gcc */
         cbRangeREM     = RTGCPHYS_MAX;  /* ditto */
         fInformREM     = false;
+#endif
     }
     else
     {
+#ifdef VBOX_WITH_REM
         GCPhysRangeREM = pCur->RamRange.GCPhys;
         cbRangeREM     = pCur->RamRange.cb;
         fInformREM     = true;
-
+#endif
         pgmR3PhysUnlinkRamRange(pVM, &pCur->RamRange);
     }
@@ -2847 +2857 @@
     pgmUnlock(pVM);
 
+#ifdef VBOX_WITH_REM
     if (fInformREM)
         REMR3NotifyPhysRamDeregister(pVM, GCPhysRangeREM, cbRangeREM);
+#endif
 
     return VINF_SUCCESS;
@@ -3183 +3195 @@
             if (fFlags & PGMPHYS_ROM_FLAGS_SHADOWED)
             {
+#ifdef VBOX_WITH_REM
                 REMR3NotifyPhysRomRegister(pVM, GCPhys, cb, NULL, true /* fShadowed */);
+#endif
                 rc = PGMR3HandlerPhysicalRegister(pVM,
                                                   fFlags & PGMPHYS_ROM_FLAGS_SHADOWED
@@ -3203 +3217 @@
                                                   NULL, "pgmPhysRomWriteHandler", MMHyperCCToR0(pVM, pRomNew),
                                                   NULL, "pgmPhysRomWriteHandler", MMHyperCCToRC(pVM, pRomNew), pszDesc);
+#ifdef VBOX_WITH_REM
                 REMR3NotifyPhysRomRegister(pVM, GCPhys, cb, NULL, false /* fShadowed */);
+#endif
             }
             if (RT_SUCCESS(rc))
@@ -3705 +3721 @@
         pVCpu->pgm.s.fA20Enabled = fEnable;
         pVCpu->pgm.s.GCPhysA20Mask = ~(RTGCPHYS)(!fEnable << 20);
+#ifdef VBOX_WITH_REM
         REMR3A20Set(pVCpu->pVMR3, pVCpu, fEnable);
+#endif
         /** @todo we're not handling this correctly for VT-x / AMD-V. See #2911 */
     }
@@ -3910 +3928 @@
                     CPUMSetChangedFlags(&pVM->aCpus[idCpu], CPUM_CHANGED_GLOBAL_TLB_FLUSH);
                 }
-
+#ifdef VBOX_WITH_REM
                 /* Flush REM translation blocks. */
                 REMFlushTBs(pVM);
+#endif
             }
         }