Changeset 93735 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 14, 2022 5:06:27 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Allow pfnPfHandler to be NULL in PGMR0HandlerPhysicalTypeSetUpContext (IEMR0InitVM does this for some reason). bugref:10093

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PGMR0.cpp (modified) (2 diffs)
• include/PGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

@@ -846 +846 @@
  * @param   pfnHandler      Pointer to the ring-0 handler callback.
  * @param   pfnPfHandler    Pointer to the ring-0 \#PF handler callback.
- *                          callback.
+ *                          callback.  Can be NULL (not recommended though).
  * @param   pszDesc         The type description.
  * @param   hType           The handle to do ring-0 callback registrations for.
@@ -859 +859 @@
      */
     AssertPtrReturn(pfnHandler, VERR_INVALID_POINTER);
-    AssertPtrReturn(pfnPfHandler, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(pfnPfHandler, VERR_INVALID_POINTER);
+
     AssertPtrReturn(pszDesc, VERR_INVALID_POINTER);
     AssertReturn(   enmKind == PGMPHYSHANDLERKIND_WRITE

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -512 +512 @@
     /** Pointer to the ring-0 callback function. */
     R0PTRTYPE(PFNPGMPHYSHANDLER)        pfnHandler;
-    /** Pointer to the ring-9 callback function for \#PFs. */
+    /** Pointer to the ring-0 callback function for \#PFs, can be NULL. */
     R0PTRTYPE(PFNPGMRZPHYSPFHANDLER)    pfnPfHandler;
     /** Description / Name. For easing debugging. */