Changeset 93912 in vbox

Timestamp:

Feb 24, 2022 11:24:42 AM (3 years ago)

Author:

vboxsync

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

150138

Message:

VMM: Add driver helper to destroy a timer, bugref:10196

Location:

trunk

Files:

• include/VBox/vmm/pdmdrv.h (modified) (3 diffs)
• src/VBox/VMM/VMMR3/PDMDriver.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmdrv.h

@@ -882 +882 @@
     DECLR3CALLBACKMEMBER(int, pfnTimerCreate,(PPDMDRVINS pDrvIns, TMCLOCK enmClock, PFNTMTIMERDRV pfnCallback, void *pvUser,
                                               uint32_t fFlags, const char *pszDesc, PTMTIMERHANDLE phTimer));
+
+    /**
+     * Destroys a timer.
+     *
+     * @returns VBox status.
+     * @param   pDrvIns         Driver instance.
+     * @param   hTimer          The timer handle to destroy.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnTimerDestroy,(PPDMDRVINS pDrvIns, TMTIMERHANDLE hTimer));
 
     /**
@@ -1518 +1527 @@
 } PDMDRVHLPR3;
 /** Current DRVHLP version number. */
-#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 14, 0)
+#define PDM_DRVHLPR3_VERSION                    PDM_VERSION_MAKE(0xf0fb, 15, 0)
 
 
@@ -1743 +1752 @@
 {
     return pDrvIns->pHlpR3->pfnTimerCreate(pDrvIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, phTimer);
+}
+
+/**
+ * @copydoc PDMDRVHLPR3::pfnTimerDestroy
+ */
+DECLINLINE(int) PDMDrvHlpTimerDestroy(PPDMDRVINS pDrvIns, TMTIMERHANDLE hTimer)
+
+{
+    return pDrvIns->pHlpR3->pfnTimerDestroy(pDrvIns, hTimer);
 }
 

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

@@ -1367 +1367 @@
 
 
+/** @interface_method_impl{PDMDRVHLPR3,pfnTimerDestroy} */
+static DECLCALLBACK(int) pdmR3DrvHlp_TimerDestroy(PPDMDRVINS pDrvIns, TMTIMERHANDLE hTimer)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    LogFlow(("pdmR3DrvHlp_TimerDestroy: caller='%s'/%d: hTimer=%RX64\n",
+             pDrvIns->pReg->szName, pDrvIns->iInstance, hTimer));
+
+    int rc = TMR3TimerDestroy(pDrvIns->Internal.s.pVMR3, hTimer);
+
+    LogFlow(("pdmR3DrvHlp_TimerDestroy: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName, pDrvIns->iInstance, rc));
+    return rc;
+}
+
+
 /** @interface_method_impl{PDMDRVHLPR3,pfnTimerSetMillies} */
 static DECLCALLBACK(int) pdmR3DrvHlp_TimerSetMillies(PPDMDRVINS pDrvIns, TMTIMERHANDLE hTimer, uint64_t cMilliesToNext)
@@ -2102 +2116 @@
     pdmR3DrvHlp_TMGetVirtualTime,
     pdmR3DrvHlp_TimerCreate,
+    pdmR3DrvHlp_TimerDestroy,
     pdmR3DrvHlp_SSMRegister,
     pdmR3DrvHlp_SSMDeregister,