Changeset 83196 in vbox

Timestamp:

Mar 4, 2020 8:32:25 AM (5 years ago)

Author:

vboxsync

Message:

VMM/PDMUsb: Always include the device name and instance number to avoid a STAM assertion about duplicate sample names when the "USB Device Reset Timer" is created for different USB devices with only a single instance each

File:

• trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp (modified) (1 diff)

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

@@ -1825 +1825 @@
              pUsbIns->pReg->szName, pUsbIns->iInstance, enmClock, pfnCallback, pvUser, fFlags, pszDesc, pszDesc, ppTimer));
 
-    if (pUsbIns->iInstance > 0) /** @todo use a string cache here later. */
-    {
-         char *pszDesc2 = MMR3HeapAPrintf(pVM, MM_TAG_PDM_USB_DESC, "%s [%u]", pszDesc, pUsbIns->iInstance);
-         if (pszDesc2)
-             pszDesc = pszDesc2;
-    }
+    /** @todo use a string cache here later. */
+    char *pszDesc2 = MMR3HeapAPrintf(pVM, MM_TAG_PDM_USB_DESC, "%s[%s:%u]", pszDesc, pUsbIns->Internal.s.pUsbDev->pReg->szName, pUsbIns->iInstance);
+    if (pszDesc2)
+        pszDesc = pszDesc2;
 
     int rc = TMR3TimerCreateUsb(pVM, pUsbIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer);