Changeset 70322 in vbox for trunk/src

Timestamp:

Dec 22, 2017 4:53:41 PM (7 years ago)

Author:

vboxsync

Message:

USB: When capturing devices, provide the speed rather than USB port version, since the speed provides a superset of the information (bugref:7280).

Location:

trunk/src/VBox

Files:

• Main/include/ConsoleImpl.h (modified) (1 diff)
• Main/src-client/ConsoleImpl.cpp (modified) (3 diffs)
• VMM/VMMR3/PDMUsb.cpp (modified) (7 diffs)

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

@@ -738 +738 @@
     static DECLCALLBACK(int) i_usbAttachCallback(Console *that, PUVM pUVM, IUSBDevice *aHostDevice, PCRTUUID aUuid,
                                                  const char *aBackend, const char *aAddress, void *pvRemoteBackend,
-                                                 USHORT aPortVersion, ULONG aMaskedIfs, const char *pszCaptureFilename);
+                                                 USBConnectionSpeed_T enmSpeed, ULONG aMaskedIfs,
+                                                 const char *pszCaptureFilename);
     static DECLCALLBACK(int) i_usbDetachCallback(Console *that, PUVM pUVM, PCRTUUID aUuid);
 #endif

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

@@ -8922 +8922 @@
     }
 
-    USHORT portVersion = 0;
-    hrc = aHostDevice->COMGETTER(PortVersion)(&portVersion);
+    USBConnectionSpeed_T enmSpeed;
+    hrc = aHostDevice->COMGETTER(Speed)(&enmSpeed);
     AssertComRCReturnRC(hrc);
-    Assert(portVersion == 1 || portVersion == 2 || portVersion == 3);
 
     int vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), 0 /* idDstCpu (saved state, see #6232) */,
                                (PFNRT)i_usbAttachCallback, 10,
                                this, ptrVM.rawUVM(), aHostDevice, uuid.raw(), Backend.c_str(),
-                               Address.c_str(), pvRemoteBackend, portVersion, aMaskedIfs,
+                               Address.c_str(), pvRemoteBackend, enmSpeed, aMaskedIfs,
                                aCaptureFilename.isEmpty() ? NULL : aCaptureFilename.c_str());
     if (RT_SUCCESS(vrc))
@@ -8981 +8980 @@
 DECLCALLBACK(int)
 Console::i_usbAttachCallback(Console *that, PUVM pUVM, IUSBDevice *aHostDevice, PCRTUUID aUuid, const char *pszBackend,
-                             const char *aAddress, void *pvRemoteBackend, USHORT aPortVersion, ULONG aMaskedIfs,
+                             const char *aAddress, void *pvRemoteBackend, USBConnectionSpeed_T aEnmSpeed, ULONG aMaskedIfs,
                              const char *pszCaptureFilename)
 {
@@ -8991 +8990 @@
     AssertReturn(!that->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
 
+    VUSBSPEED enmSpeed = VUSB_SPEED_UNKNOWN;
+    switch (aEnmSpeed)
+    {
+        case USBConnectionSpeed_Low:        enmSpeed = VUSB_SPEED_LOW;          break;
+        case USBConnectionSpeed_Full:       enmSpeed = VUSB_SPEED_FULL;         break;
+        case USBConnectionSpeed_High:       enmSpeed = VUSB_SPEED_HIGH;         break;
+        case USBConnectionSpeed_Super:      enmSpeed = VUSB_SPEED_SUPER;        break;
+        case USBConnectionSpeed_SuperPlus:  enmSpeed = VUSB_SPEED_SUPERPLUS;    break;
+        default:                            AssertFailed();                     break;
+    }
+
     int vrc = PDMR3UsbCreateProxyDevice(pUVM, aUuid, pszBackend, aAddress, pvRemoteBackend,
-                                        aPortVersion == 3 ? VUSB_STDVER_30 :
-                                        aPortVersion == 2 ? VUSB_STDVER_20 : VUSB_STDVER_11,
-                                        aMaskedIfs, pszCaptureFilename);
+                                        enmSpeed, aMaskedIfs, pszCaptureFilename);
     LogFlowFunc(("vrc=%Rrc\n", vrc));
     LogFlowFuncLeave();

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

@@ -459 +459 @@
 
 /**
- * Translates a USB vesion (a bit-mask) to USB speed (enum). Picks
+ * Translates a USB version (a bit-mask) to USB speed (enum). Picks
  * the highest available version.
  *
@@ -480 +480 @@
 
     return enmSpd;
+}
+
+
+/**
+ * Translates a USB speed (enum) to USB version.
+ *
+ * @returns USB version mask
+ *
+ * @param   enmSpeed        The USB connection speed.
+ *
+ */
+static uint32_t pdmR3UsbSpd2Ver(VUSBSPEED enmSpeed)
+{
+    uint32_t    iUsbVersion = 0;
+    Assert(enmSpeed != VUSB_SPEED_UNKNOWN);
+
+    switch (enmSpeed)
+    {
+    case VUSB_SPEED_LOW:
+    case VUSB_SPEED_FULL:
+        iUsbVersion = VUSB_STDVER_11;
+        break;
+    case VUSB_SPEED_HIGH:
+        iUsbVersion = VUSB_STDVER_20;
+        break;
+    case VUSB_SPEED_SUPER:
+    case VUSB_SPEED_SUPERPLUS:
+    default:
+        iUsbVersion = VUSB_STDVER_30;
+        break;
+    }
+
+    return iUsbVersion;
 }
 
@@ -987 +1020 @@
  * @param   pszAddress          The address string.
  * @param   pvBackend           Pointer to the backend.
- * @param   iUsbVersion         The preferred USB version.
+ * @param   enmSpeed            The speed the USB device is operating at.
  * @param   fMaskedIfs          The interfaces to hide from the guest.
  * @param   pszCaptureFilename  Path to the file for USB traffic capturing, optional.
  */
 VMMR3DECL(int) PDMR3UsbCreateProxyDevice(PUVM pUVM, PCRTUUID pUuid, const char *pszBackend, const char *pszAddress, void *pvBackend,
-                                         uint32_t iUsbVersion, uint32_t fMaskedIfs, const char *pszCaptureFilename)
+                                         VUSBSPEED enmSpeed, uint32_t fMaskedIfs, const char *pszCaptureFilename)
 {
     /*
@@ -1003 +1036 @@
     AssertPtrReturn(pUuid, VERR_INVALID_POINTER);
     AssertPtrReturn(pszAddress, VERR_INVALID_POINTER);
-    AssertReturn(    iUsbVersion == VUSB_STDVER_30
-                 ||  iUsbVersion == VUSB_STDVER_20
-                 ||  iUsbVersion == VUSB_STDVER_11, VERR_INVALID_PARAMETER);
+    AssertReturn(    enmSpeed == VUSB_SPEED_LOW
+                 ||  enmSpeed == VUSB_SPEED_FULL
+                 ||  enmSpeed == VUSB_SPEED_HIGH
+                 ||  enmSpeed == VUSB_SPEED_SUPER
+                 ||  enmSpeed == VUSB_SPEED_SUPERPLUS, VERR_INVALID_PARAMETER);
 
     /*
@@ -1021 +1056 @@
      */
     PPDMUSBHUB pHub;
+    uint32_t iUsbVersion = pdmR3UsbSpd2Ver(enmSpeed);
     int rc = pdmR3UsbFindHub(pVM, iUsbVersion, &pHub);
     if (RT_FAILURE(rc))
@@ -1042 +1078 @@
         rc = CFGMR3InsertString(pConfig,  "UUID", szUuid);                      AssertRCBreak(rc);
         rc = CFGMR3InsertString(pConfig, "Backend", pszBackend);                AssertRCBreak(rc);
-        rc = CFGMR3InsertInteger(pConfig, "USBVersion", iUsbVersion);           AssertRCBreak(rc);
         rc = CFGMR3InsertInteger(pConfig, "pvBackend", (uintptr_t)pvBackend);   AssertRCBreak(rc);
         rc = CFGMR3InsertInteger(pConfig, "MaskedIfs", fMaskedIfs);             AssertRCBreak(rc);
@@ -1054 +1089 @@
     }
 
-    VUSBSPEED enmSpeed = pdmR3UsbVer2Spd(iUsbVersion);
+    if (enmSpeed == VUSB_SPEED_UNKNOWN)
+        enmSpeed = pdmR3UsbVer2Spd(iUsbVersion);
 
     /*