Changeset 89673 in vbox

Timestamp:

Jun 14, 2021 9:38:15 AM (4 years ago)

Author:

vboxsync

Message:

VMM/PDMUsb: Backed out r145077 + 144791. This problem should be fixed in the VUsb code. bugref:10021

File:

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

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

@@ -1831 +1831 @@
     char szName[32];
     AssertReturn(strlen(pszDesc) < sizeof(szName) - 8, VERR_INVALID_NAME);
-    /* Try to use unique names for USB timers in order not to confuse STAM (see xtracker#10021). */
-    RTStrPrintf(szName, sizeof(szName), "%s[%u:%s]", pszDesc, pUsbIns->iInstance, pUsbIns->Internal.s.pUsbDev->pReg->szName);
-
-    int rc = TMR3TimerCreateUsb(pVM, pUsbIns, enmClock, pfnCallback, pvUser, fFlags, szName, phTimer);
+    if (pUsbIns->iInstance > 0)
+    {
+        RTStrPrintf(szName, sizeof(szName), "%s[%u:%s]", pszDesc, pUsbIns->iInstance, pUsbIns->Internal.s.pUsbDev->pReg->szName);
+        pszDesc = szName;
+    }
+
+    int rc = TMR3TimerCreateUsb(pVM, pUsbIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, phTimer);
 
     LogFlow(("pdmR3UsbHlp_TMTimerCreate: caller='%s'/%d: returns %Rrc *phTimer=%p\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc, *phTimer));