Changeset 20706 in vbox

Timestamp:

Jun 19, 2009 9:51:12 AM (16 years ago)

Author:

vboxsync

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

48811

Message:

VBox/pdmdrv.h: Added PDMDRVHLP::pfnSTAMDeregister, major PDMDRVHLP version bump.

Location:

trunk

Files:

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

trunk/include/VBox/pdmdrv.h

@@ -582 +582 @@
      * RTStrPrintf like fashion.
      *
-     * @returns VBox status.
      * @param   pDrvIns     Driver instance.
      * @param   pvSample    Pointer to the sample.
@@ -599 +598 @@
      * RTStrPrintfV like fashion.
      *
-     * @returns VBox status.
      * @param   pDrvIns         Driver instance.
      * @param   pvSample        Pointer to the sample.
@@ -611 +609 @@
     DECLR3CALLBACKMEMBER(void, pfnSTAMRegisterV,(PPDMDRVINS pDrvIns, void *pvSample, STAMTYPE enmType, STAMVISIBILITY enmVisibility,
                                                  STAMUNIT enmUnit, const char *pszDesc, const char *pszName, va_list args));
+
+    /**
+     * Deregister a statistic item previously registered with pfnSTAMRegister,
+     * pfnSTAMRegisterF or pfnSTAMRegisterV
+     *
+     * @returns VBox status.
+     * @param   pDrvIns         Driver instance.
+     * @param   pvSample        Pointer to the sample.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSTAMDeregister,(PPDMDRVINS pDrvIns, void *pvSample));
 
     /**
@@ -701 +709 @@
 
 /** Current DRVHLP version number. */
-#define PDM_DRVHLP_VERSION  0x90030000
+#define PDM_DRVHLP_VERSION  0x90040000
 
 
@@ -879 +887 @@
 
 /**
+ * @copydoc PDMDRVHLP::pfnSTAMDeregister
+ */
+DECLINLINE(int) PDMDrvHlpSTAMDeregister(PPDMDRVINS pDrvIns, void *pvSample)
+{
+    return pDrvIns->pDrvHlp->pfnSTAMDeregister(pDrvIns, pvSample);
+}
+
+/**
  * @copydoc PDMDRVHLP::pfnUSBRegisterHub
  */

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -940 +940 @@
 
 
+/** @copydoc PDMDRVHLP::pfnSTAMDeregister */
+static DECLCALLBACK(int) pdmR3DrvHlp_STAMDeregister(PPDMDRVINS pDrvIns, void *pvSample)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    VM_ASSERT_EMT(pDrvIns->Internal.s.pVM);
+
+    int rc = STAMR3DeregisterU(pDrvIns->Internal.s.pVM->pUVM, pvSample);
+    AssertRC(rc);
+    return rc;
+}
+
+
 /** @copydoc PDMDRVHLP::pfnSUPCallVMMR0Ex */
 static DECLCALLBACK(int) pdmR3DrvHlp_SUPCallVMMR0Ex(PPDMDRVINS pDrvIns, unsigned uOperation, void *pvArg, unsigned cbArg)
@@ -1056 +1068 @@
     pdmR3DrvHlp_STAMRegisterF,
     pdmR3DrvHlp_STAMRegisterV,
+    pdmR3DrvHlp_STAMDeregister,
     pdmR3DrvHlp_SUPCallVMMR0Ex,
     pdmR3DrvHlp_USBRegisterHub,