Changeset 30528 in vbox

Timestamp:

Jun 30, 2010 2:16:44 PM (15 years ago)

Author:

vboxsync

Message:

USB: properly name internal USB devices for logging

Location:

trunk/src/VBox

Files:

• Devices/USB/DrvVUSBRootHub.cpp (modified) (3 diffs)
• VMM/PDMUsb.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/USB/DrvVUSBRootHub.cpp

@@ -840 +840 @@
         RTMemFree(pUrb);
     }
+    if (pRh->Hub.pszName)
+    {
+        RTStrFree(pRh->Hub.pszName);
+        pRh->Hub.pszName = NULL;
+    }
     RTCritSectDelete(&pRh->CritSect);
 }
@@ -851 +856 @@
 static DECLCALLBACK(int) vusbRhConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
-    LogFlow(("vusbRhConstruct:\n"));
+    LogFlow(("vusbRhConstruct: Instance %d\n", pDrvIns->iInstance));
     PVUSBROOTHUB pThis = PDMINS_2_DATA(pDrvIns, PVUSBROOTHUB);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
@@ -894 +899 @@
     pThis->Hub.cDevices                 = 0;
     pThis->Hub.Dev.pHub                 = &pThis->Hub;
+    RTStrAPrintf(&pThis->Hub.pszName, "RootHub#%d", pDrvIns->iInstance);
     /* misc */
     pThis->pDrvIns                      = pDrvIns;

trunk/src/VBox/VMM/PDMUsb.cpp

@@ -573 +573 @@
     pUsbIns->iInstance                      = iInstance;
     pUsbIns->pvInstanceDataR3               = &pUsbIns->achInstanceData[0];
+    pUsbIns->pszName                        = RTStrDup(pUsbDev->pReg->szName);
 
     /*
@@ -986 +987 @@
     pUsbIns->u32Version = 0;
     pUsbIns->pReg = NULL;
+    if (pUsbIns->pszName)
+    {
+        RTStrFree(pUsbIns->pszName);
+        pUsbIns->pszName = NULL;
+    }
     CFGMR3RemoveNode(pUsbIns->Internal.s.pCfgDelete);
     MMR3HeapFree(pUsbIns);