Changeset 90997 in vbox for trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp

Timestamp:

Aug 30, 2021 2:04:48 PM (3 years ago)

Author:

vboxsync

Message:

VMM,PDM,PGM: Restrict the VMSetError and VMSetRuntimeError APIs to ring-3, these never worked properly in ring-0 or raw-mode. A PAEmode runtime error was the only place any of these were used, but given that the VMSetRuntimeError codepath starts with an assertion, it can't have been used/tested. The PAEmode runtime error shouldn't necessarily be triggered by PGM anyway, but IEM. Removed VMMCALLRING3_VM_SET_ERROR and VMMCALLRING3_VM_SET_RUNTIME_ERROR. bugref:10093

File:

• trunk/src/VBox/VMM/VMMR3/PDMDriver.cpp (modified) (3 diffs)

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

@@ -1197 +1197 @@
 
 
-/** @interface_method_impl{PDMDRVHLPR3,pfnVMSetError} */
-static DECLCALLBACK(int) pdmR3DrvHlp_VMSetError(PPDMDRVINS pDrvIns, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...)
-{
-    PDMDRV_ASSERT_DRVINS(pDrvIns);
-    va_list args;
-    va_start(args, pszFormat);
-    int rc2 = VMSetErrorV(pDrvIns->Internal.s.pVMR3, rc, RT_SRC_POS_ARGS, pszFormat, args); Assert(rc2 == rc); NOREF(rc2);
-    va_end(args);
-    return rc;
-}
-
-
 /** @interface_method_impl{PDMDRVHLPR3,pfnVMSetErrorV} */
 static DECLCALLBACK(int) pdmR3DrvHlp_VMSetErrorV(PPDMDRVINS pDrvIns, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list va)
@@ -1214 +1202 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     int rc2 = VMSetErrorV(pDrvIns->Internal.s.pVMR3, rc, RT_SRC_POS_ARGS, pszFormat, va); Assert(rc2 == rc); NOREF(rc2);
-    return rc;
-}
-
-
-/** @interface_method_impl{PDMDRVHLPR3,pfnVMSetRuntimeError} */
-static DECLCALLBACK(int) pdmR3DrvHlp_VMSetRuntimeError(PPDMDRVINS pDrvIns, uint32_t fFlags, const char *pszErrorId, const char *pszFormat, ...)
-{
-    PDMDRV_ASSERT_DRVINS(pDrvIns);
-    va_list args;
-    va_start(args, pszFormat);
-    int rc = VMSetRuntimeErrorV(pDrvIns->Internal.s.pVMR3, fFlags, pszErrorId, pszFormat, args);
-    va_end(args);
     return rc;
 }
@@ -2037 +2013 @@
     pdmR3DrvHlp_AssertEMT,
     pdmR3DrvHlp_AssertOther,
-    pdmR3DrvHlp_VMSetError,
     pdmR3DrvHlp_VMSetErrorV,
-    pdmR3DrvHlp_VMSetRuntimeError,
     pdmR3DrvHlp_VMSetRuntimeErrorV,
     pdmR3DrvHlp_VMState,