Changeset 93989 in vbox for trunk/src/VBox/Devices/USB/VUSBInternal.h

Timestamp:

Feb 28, 2022 3:28:20 PM (3 years ago)

Author:

vboxsync

Message:

Devices/USB: Fix memory leak introduced by r150140, and get rid of the VUSBDEV member of the roothub which is not used anyway, bugref:10196

File:

• trunk/src/VBox/Devices/USB/VUSBInternal.h (modified) (6 diffs)

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -291 +291 @@
 int vusbDevInit(PVUSBDEV pDev, PPDMUSBINS pUsbIns, const char *pszCaptureFilename);
 void vusbDevDestroy(PVUSBDEV pDev);
-
-DECLINLINE(bool) vusbDevIsRh(PVUSBDEV pDev)
-{
-    return (pDev->pHub == (PVUSBROOTHUB)pDev);
-}
-
 bool vusbDevDoSelectConfig(PVUSBDEV dev, PCVUSBDESCCONFIGEX pCfg);
 void vusbDevMapEndpoint(PVUSBDEV dev, PCVUSBDESCENDPOINTEX ep);
@@ -355 +349 @@
 typedef struct VUSBROOTHUB
 {
-    /** VUSB device data for the roothub @todo Remove. */
-    VUSBDEV                     Dev;
     /** Pointer to the driver instance. */
     PPDMDRVINS                  pDrvIns;
@@ -373 +365 @@
     PVUSBROOTHUBLOAD            pLoad;
 
+    /** Roothub device state. */
+    VUSBDEVICESTATE             enmState;
     /** Number of ports this roothub offers. */
     uint16_t                    cPorts;
@@ -379 +373 @@
     /** Name of the roothub. Used for logging. */
     char                        *pszName;
+    /** URB pool for URBs from the roothub. */
+    VUSBURBPOOL                 UrbPool;
 
 #if HC_ARCH_BITS == 32
@@ -676 +672 @@
  * @returns New reference count.
  * @param   pThis          The VUSB device pointer.
- */
-DECLINLINE(uint32_t) vusbDevRetain(PVUSBDEV pThis)
+ * @param   pszWho         Caller of the retaining.
+ */
+DECLINLINE(uint32_t) vusbDevRetain(PVUSBDEV pThis, const char *pszWho)
 {
     AssertPtrReturn(pThis, UINT32_MAX);
 
     uint32_t cRefs = ASMAtomicIncU32(&pThis->cRefs);
+    LogFlowFunc(("pThis=%p{.cRefs=%u}[%s]\n", pThis, cRefs, pszWho)); RT_NOREF(pszWho);
     AssertMsg(cRefs > 1 && cRefs < _1M, ("%#x %p\n", cRefs, pThis));
     return cRefs;
@@ -691 +689 @@
  * @returns New reference count.
  * @retval 0 if no onw is holding a reference anymore causing the device to be destroyed.
- */
-DECLINLINE(uint32_t) vusbDevRelease(PVUSBDEV pThis)
+ * @param   pThis          The VUSB device pointer.
+ * @param   pszWho         Caller of the retaining.
+ */
+DECLINLINE(uint32_t) vusbDevRelease(PVUSBDEV pThis, const char *pszWho)
 {
     AssertPtrReturn(pThis, UINT32_MAX);
 
     uint32_t cRefs = ASMAtomicDecU32(&pThis->cRefs);
+    LogFlowFunc(("pThis=%p{.cRefs=%u}[%s]\n", pThis, cRefs, pszWho)); RT_NOREF(pszWho);
     AssertMsg(cRefs < _1M, ("%#x %p\n", cRefs, pThis));
     if (cRefs == 0)