Changeset 55331 in vbox for trunk

Timestamp:

Apr 17, 2015 1:38:38 PM (10 years ago)

Author:

vboxsync

Message:

PGMHandlerPhysicalChangeCallbacks -> PGMHandlerPhysicalChangeUserArgs.

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pgm.h

@@ -355 +355 @@
 VMMDECL(int)        PGMHandlerPhysicalModify(PVM pVM, RTGCPHYS GCPhysCurrent, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast);
 VMMDECL(int)        PGMHandlerPhysicalDeregister(PVM pVM, RTGCPHYS GCPhys);
-VMMDECL(int)        PGMHandlerPhysicalChangeCallbacks(PVM pVM, RTGCPHYS GCPhys,
-                                                      R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,
-                                                      R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTR0PTR pvUserR0,
-                                                      RCPTRTYPE(PFNPGMRCPHYSHANDLER) pfnHandlerRC, RTRCPTR pvUserRC,
-                                                      R3PTRTYPE(const char *) pszDesc);
+VMMDECL(int)        PGMHandlerPhysicalChangeUserArgs(PVM pVM, RTGCPHYS GCPhys, RTR3PTR pvUserR3, RTR0PTR pvUserR0, RTRCPTR pvUserRC);
 VMMDECL(int)        PGMHandlerPhysicalSplit(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysSplit);
 VMMDECL(int)        PGMHandlerPhysicalJoin(PVM pVM, RTGCPHYS GCPhys1, RTGCPHYS GCPhys2);

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

@@ -642 +642 @@
 
 /**
- * Changes the callbacks associated with a physical access handler.
+ * Changes the user callback arguments associated with a physical access
+ * handler.
  *
  * @returns VBox status code.
  * @param   pVM             Pointer to the VM.
- * @param   GCPhys          Start physical address.
- * @param   pfnHandlerR3    The R3 handler.
+ * @param   GCPhys          Start physical address of the handler.
  * @param   pvUserR3        User argument to the R3 handler.
- * @param   pfnHandlerR0    The R0 handler.
  * @param   pvUserR0        User argument to the R0 handler.
- * @param   pfnHandlerRC    The RC handler.
  * @param   pvUserRC        User argument to the RC handler. Values larger or
  *                          equal to 0x10000 will be relocated automatically.
- * @param   pszDesc         Pointer to description string. This must not be freed.
- */
-VMMDECL(int) PGMHandlerPhysicalChangeCallbacks(PVM pVM, RTGCPHYS GCPhys,
-                                               R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,
-                                               R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTR0PTR pvUserR0,
-                                               RCPTRTYPE(PFNPGMRCPHYSHANDLER) pfnHandlerRC, RTRCPTR pvUserRC,
-                                               R3PTRTYPE(const char *) pszDesc)
-{
-    /*
-     * Get the handler.
+ */
+VMMDECL(int) PGMHandlerPhysicalChangeUserArgs(PVM pVM, RTGCPHYS GCPhys, RTR3PTR pvUserR3, RTR0PTR pvUserR0, RTRCPTR pvUserRC)
+{
+    /*
+     * Find the handler.
      */
     int rc = VINF_SUCCESS;
@@ -671 +664 @@
     {
         /*
-         * Change callbacks.
+         * Change arguments.
          */
-        pCur->pfnHandlerR3  = pfnHandlerR3;
-        pCur->pvUserR3      = pvUserR3;
-        pCur->pfnHandlerR0  = pfnHandlerR0;
-        pCur->pvUserR0      = pvUserR0;
-        pCur->pfnHandlerRC  = pfnHandlerRC;
-        pCur->pvUserRC      = pvUserRC;
-        pCur->pszDesc       = pszDesc;
+        pCur->pvUserR3 = pvUserR3;
+        pCur->pvUserR0 = pvUserR0;
+        pCur->pvUserRC = pvUserRC;
     }
     else

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

@@ -2583 +2583 @@
             PPGMPOOLPAGE pNewHead = &pPool->aPages[pPage->iMonitoredNext];
             pNewHead->iMonitoredPrev = NIL_PGMPOOL_IDX;
-            rc = PGMHandlerPhysicalChangeCallbacks(pVM, pPage->GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK,
-                                                   pPool->pfnAccessHandlerR3, MMHyperCCToR3(pVM, pNewHead),
-                                                   pPool->pfnAccessHandlerR0, MMHyperCCToR0(pVM, pNewHead),
-                                                   pPool->pfnAccessHandlerRC, MMHyperCCToRC(pVM, pNewHead),
-                                                   pPool->pszAccessHandler);
+            rc = PGMHandlerPhysicalChangeUserArgs(pVM, pPage->GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK, MMHyperCCToR3(pVM, pNewHead),
+                                                  MMHyperCCToR0(pVM, pNewHead), MMHyperCCToRC(pVM, pNewHead));
+
             AssertFatalRCSuccess(rc);
             pPage->iMonitoredNext = NIL_PGMPOOL_IDX;