Changeset 81667 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2019 11:08:21 AM (5 years ago)

Author:

vboxsync

Message:

Main: Added a portPath attribute to IUSBDevice. This will allow uniquely identifying a specific USB port in a system (see bugref:9518).

Location:

trunk/src/VBox

Files:

• Devices/Network/DevPCNet.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/HostUSBDeviceImpl.h (modified) (1 diff)
• Main/include/RemoteUSBDeviceImpl.h (modified) (3 diffs)
• Main/include/USBDeviceImpl.h (modified) (2 diffs)
• Main/src-client/RemoteUSBDeviceImpl.cpp (modified) (6 diffs)
• Main/src-client/USBDeviceImpl.cpp (modified) (3 diffs)
• Main/src-server/HostUSBDeviceImpl.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -1836 +1836 @@
     unsigned cbPacket = cb;
     uint32_t iDesc = CSR_XMTRC(pThis);
+    uint32_t iFirstDesc = iDesc;
 
     STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatTxLenCalc), a);
@@ -1845 +1846 @@
         else
             iDesc--;
+
+        if (iDesc == iFirstDesc)
+            break;
 
         RTGCPHYS32 addrDesc = pcnetTdraAddr(pThis, iDesc);
@@ -2484 +2488 @@
     int         rc;
     unsigned    cFlushIrq = 0;
+    int         cMax = 32;
     STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatTransmit), a);
     do
@@ -2718 +2723 @@
         STAM_COUNTER_INC(&pThis->aStatXmitChainCounts[RT_MIN(cBuffers,
                                                       RT_ELEMENTS(pThis->aStatXmitChainCounts)) - 1]);
+        if (--cMax == 0)
+            break;
     } while (CSR_TXON(pThis));          /* transfer on */
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -20671 +20671 @@
   <interface
     name="IUSBDevice" extends="$unknown"
-    uuid="7ea6ec18-ed43-48e6-a12c-6988c5c9e3ff"
+    uuid="6dc83c2c-81a9-4005-9d52-fc45a78bf3f5"
     wsmap="managed"
     reservedAttributes="4"
@@ -20720 +20720 @@
 
     <attribute name="address" type="wstring" readonly="yes">
-      <desc>Host specific address of the device.</desc>
+      <desc>
+        Host-specific address of the device, uniquely
+        identifying a physically connected device in the system.
+        Note that the address of a USB device may change across
+        device re-plugs and host suspend/resume cycles or reboots.
+      </desc>
     </attribute>
 
     <attribute name="port" type="unsigned short" readonly="yes">
       <desc>
-        Host USB port number the device is physically
+        Host USB port number on the hub the device is physically
         connected to.
+      </desc>
+    </attribute>
+
+    <attribute name="portPath" type="wstring" readonly="yes">
+      <desc>
+        Host-specific identifier of the port (including hub) the USB
+        device is physically connected to. Note that hubs may be
+        dynamically added and removed, and that hub enumeration may not
+        be consistent across host reboots.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/HostUSBDeviceImpl.h

@@ -259 +259 @@
     HRESULT getAddress(com::Utf8Str &aAddress);
     HRESULT getPort(USHORT *aPort);
+    HRESULT getPortPath(com::Utf8Str &aPortPath);
     HRESULT getVersion(USHORT *aVersion);
     HRESULT getPortVersion(USHORT *aPortVersion);

trunk/src/VBox/Main/include/RemoteUSBDeviceImpl.h

@@ -79 +79 @@
     HRESULT getPort(USHORT *aPort);
     HRESULT getVersion(USHORT *aVersion);
-    HRESULT getPortVersion(USHORT *aPortVersion);
+    HRESULT getPortPath(com::Utf8Str &aAddress);
     HRESULT getSpeed(USBConnectionSpeed_T *aSpeed);
     HRESULT getRemote(BOOL *aRemote);
@@ -92 +92 @@
     {
         Data() : vendorId(0), productId(0), revision(0), port(0), version(1),
-                 portVersion(1), speed(USBConnectionSpeed_Null), dirty(FALSE),
+                 speed(USBConnectionSpeed_Null), dirty(FALSE),
                  devId(0), clientId(0) {}
 
@@ -109 +109 @@
 
         const uint16_t port;
+        const Utf8Str portPath;
         const uint16_t version;
-        const uint16_t portVersion;
         const USBConnectionSpeed_T speed;
 

trunk/src/VBox/Main/include/USBDeviceImpl.h

@@ -57 +57 @@
     HRESULT getAddress(com::Utf8Str &aAddress);
     HRESULT getPort(USHORT *aPort);
+    HRESULT getPortPath(com::Utf8Str &aPortPath);
     HRESULT getVersion(USHORT *aVersion);
     HRESULT getSpeed(USBConnectionSpeed_T *aSpeed);
@@ -91 +92 @@
         /** The host port number. */
         const USHORT port;
+        /** The host port path. */
+        const com::Utf8Str portPath;
         /** The major USB version number of the device. */
         const USHORT version;

trunk/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp

@@ -78 +78 @@
     unconst(mData.backend)      = "vrdp";
 
+    char port[16];
+    RTStrPrintf(port, sizeof(port), "%u", pDevDesc->idPort);
+    unconst(mData.portPath)     = port;
+
     unconst(mData.port)         = pDevDesc->idPort;
     unconst(mData.version)      = (uint16_t)(pDevDesc->bcdUSB >> 8);
@@ -89 +93 @@
             case VRDE_USBDEVICESPEED_LOW:
             case VRDE_USBDEVICESPEED_FULL:
-                unconst(mData.portVersion) = 1;
                 unconst(mData.speed) = USBConnectionSpeed_Full;
                 break;
@@ -95 +98 @@
             case VRDE_USBDEVICESPEED_HIGH:
             case VRDE_USBDEVICESPEED_VARIABLE:
-                unconst(mData.portVersion) = 2;
                 unconst(mData.speed) = USBConnectionSpeed_High;
                 break;
 
             case VRDE_USBDEVICESPEED_SUPERSPEED:
-                unconst(mData.portVersion) = 3;
                 unconst(mData.speed) = USBConnectionSpeed_Super;
                 break;
@@ -107 +108 @@
     else
     {
-        unconst(mData.portVersion)  = mData.version;
         unconst(mData.speed) = mData.version == 3 ? USBConnectionSpeed_Super
                              : mData.version == 2 ? USBConnectionSpeed_High
@@ -154 +154 @@
 
     unconst(mData.port) = 0;
+    unconst(mData.portPath).setNull();
     unconst(mData.version) = 1;
-    unconst(mData.portVersion) = 1;
 
     unconst(mData.dirty) = FALSE;
@@ -237 +237 @@
 }
 
+HRESULT RemoteUSBDevice::getPortPath(com::Utf8Str &aPortPath)
+{
+    /* this is const, no need to lock */
+    aPortPath = mData.portPath;
+
+    return S_OK;
+}
+
 HRESULT RemoteUSBDevice::getVersion(USHORT *aVersion)
 {
     /* this is const, no need to lock */
     *aVersion = mData.version;
-
-    return S_OK;
-}
-
-HRESULT RemoteUSBDevice::getPortVersion(USHORT *aPortVersion)
-{
-    /* this is const, no need to lock */
-    *aPortVersion = mData.portVersion;
 
     return S_OK;

trunk/src/VBox/Main/src-client/USBDeviceImpl.cpp

@@ -96 +96 @@
     ComAssertComRCRet(hrc, hrc);
 
+    hrc = aUSBDevice->COMGETTER(PortPath)(bstr.asOutParam());
+    ComAssertComRCRet(hrc, hrc);
+
     hrc = aUSBDevice->COMGETTER(Version)(&unconst(mData.version));
     ComAssertComRCRet(hrc, hrc);
@@ -143 +146 @@
 
     unconst(mData.port) = 0;
+    unconst(mData.portPath).setNull();
     unconst(mData.version) = 1;
 
@@ -273 +277 @@
     /* this is const, no need to lock */
     *aPort = mData.port;
+
+    return S_OK;
+}
+
+HRESULT OUSBDevice::getPortPath(com::Utf8Str &aPortPath)
+{
+    /* this is const, no need to lock */
+    aPortPath = mData.portPath;
 
     return S_OK;

trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp

@@ -204 +204 @@
 
     *aPort = mUsb->bPort;
+
+    return S_OK;
+}
+
+
+HRESULT HostUSBDevice::getPortPath(com::Utf8Str &aPortPath)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    aPortPath = mUsb->pszPortPath;
 
     return S_OK;