Changeset 6546 in vbox for trunk/include/VBox

Timestamp:

Jan 28, 2008 9:58:59 PM (17 years ago)

Author:

vboxsync

Message:

VBOX_WITH_NEW_PHYS_CODE changes mostly realted to REM. Killed a warning in cpu-exec.c.

Location:

trunk/include/VBox

Files:

• mm.h (modified) (4 diffs)
• pgm.h (modified) (4 diffs)
• rem.h (modified) (3 diffs)

trunk/include/VBox/mm.h

@@ -114 +114 @@
 /** @} */
 
+#ifndef VBOX_WITH_NEW_PHYS_CODE
 /** @name MMR3PhysRegisterEx registration type
  * @{
@@ -127 +128 @@
 } MMPHYSREG;
 /** @} */
+#endif
 
 /**
@@ -881 +883 @@
  * @param   pszDesc     Description of the memory.
  * @thread  The Emulation Thread.
+ *
+ * @todo    This will only be used for registering MMIO2 memory from devices. So, rename it.
  */
 MMR3DECL(int) MMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, const char *pszDesc);
 
+#ifndef VBOX_WITH_NEW_PHYS_CODE
 /**
  * Register externally allocated RAM for the virtual machine.
@@ -900 +905 @@
  * @thread  The Emulation Thread.
  * @todo update this description.
+ * @deprecated  For the old dynamic allocation code only. Will be removed with VBOX_WITH_NEW_PHYS_CODE.
  */
 MMR3DECL(int) MMR3PhysRegisterEx(PVM pVM, void *pvRam, RTGCPHYS GCPhys, unsigned cb, unsigned fFlags, MMPHYSREG enmType, const char *pszDesc);
+#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 /**

trunk/include/VBox/pgm.h

@@ -1414 +1414 @@
 PGMR3DECL(int) PGMR3ChangeShwPDMappings(PVM pVM, bool fEnable);
 
+#ifndef VBOX_WITH_NEW_PHYS_CODE
 /**
  * Allocate missing physical pages for an existing guest RAM range.
@@ -1422 +1423 @@
  */
 PGMR3DECL(int) PGM3PhysGrowRange(PVM pVM, RTGCPHYS GCPhys);
+#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 /**
@@ -1442 +1444 @@
 PGMR3DECL(int) PGMR3PhysRegister(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc);
 
+#ifndef VBOX_WITH_NEW_PHYS_CODE
 /**
  * Register a chunk of a the physical memory range with PGM. MM is responsible
@@ -1457 +1460 @@
  */
 PGMR3DECL(int) PGMR3PhysRegisterChunk(PVM pVM, void *pvRam, RTGCPHYS GCPhys, size_t cb, unsigned fFlags, const SUPPAGE *paPages, const char *pszDesc);
+#endif /* !VBOX_WITH_NEW_PHYS_CODE */
 
 /**

trunk/include/VBox/rem.h

@@ -284 +284 @@
  * @param   cb          Size of the memory.
  * @param   fFlags      Flags of the MM_RAM_FLAGS_* defines.
- * @param   pvRam       The HC address of the RAM.
- */
-REMR3DECL(void) REMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, void *pvRam, unsigned fFlags);
-
+ */
+REMR3DECL(void) REMR3NotifyPhysRamRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, unsigned fFlags);
+
+#ifndef VBOX_WITH_NEW_PHYS_CODE
 /**
  * Notification about a successful PGMR3PhysRegisterChunk() call.
@@ -298 +298 @@
  */
 REMR3DECL(void) REMR3NotifyPhysRamChunkRegister(PVM pVM, RTGCPHYS GCPhys, RTUINT cb, RTHCUINTPTR pvRam, unsigned fFlags);
+#endif
 
 /**
@@ -307 +308 @@
  * @param   pvCopy      Pointer to the ROM copy.
  * @param   fShadow     Whether it's currently writable shadow ROM or normal readonly ROM.
- *                      This function will be called when ever the protection of the 
+ *                      This function will be called when ever the protection of the
  *                      shadow ROM changes (at reset and end of POST).
  */