Changeset 93651 in vbox

Timestamp:

Feb 8, 2022 10:53:29 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

149805

Message:

VMM/PGM,*: Split the physical access handler type registration into separate ring-0 and ring-3 steps, expanding the type to 64-bit. [build fixes] bugref:10094

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pgm.h

@@ -127 +127 @@
     PGMPHYSHANDLERKIND_END,
     /** Type size hack. */
-    PGMPHYSHANDLERKIND_32BIT_HACK = 0x7fffffff,
+    PGMPHYSHANDLERKIND_32BIT_HACK = 0x7fffffff
 } PGMPHYSHANDLERKIND;
 

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

@@ -860 +860 @@
 /** @interface_method_impl{PDMDEVHLPR3,pfnPGMHandlerPhysicalTypeRegister} */
 static DECLCALLBACK(int) pdmR3DevHlp_PGMHandlerPhysicalTypeRegister(PPDMDEVINS pDevIns, PGMPHYSHANDLERKIND enmKind,
-                                                                    PFNPGMPHYSHANDLER pfnHandlerR3, const char *pszDesc,
+                                                                    PFNPGMPHYSHANDLER pfnHandler, const char *pszDesc,
                                                                     PPGMPHYSHANDLERTYPE phType)
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
     PVM  pVM = pDevIns->Internal.s.pVMR3;
-    LogFlow(("pdmR3DevHlp_PGMHandlerPhysicalTypeRegister: caller='%s'/%d: enmKind=%d pfnHandlerR3=%p pszDesc=%p:{%s} phType=%p\n",
-             pDevIns->pReg->szName, pDevIns->iInstance, enmKind, pfnHandlerR3, pszDesc, pszDesc, phType));
+    LogFlow(("pdmR3DevHlp_PGMHandlerPhysicalTypeRegister: caller='%s'/%d: enmKind=%d pfnHandler=%p pszDesc=%p:{%s} phType=%p\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, enmKind, pfnHandler, pszDesc, pszDesc, phType));
 
     int rc = PGMR3HandlerPhysicalTypeRegister(pVM, enmKind,
                                               pDevIns->Internal.s.fIntFlags & PDMDEVINSINT_FLAGS_R0_ENABLED
                                               ? PGMPHYSHANDLER_F_R0_DEVINS_IDX : 0,
-                                              pfnHandlerR3, pszDesc, phType);
+                                              pfnHandler, pszDesc, phType);
 
     Log(("pdmR3DevHlp_PGMHandlerPhysicalTypeRegister: caller='%s'/%d: returns %Rrc\n",