Changeset 60758 in vbox for trunk/src

Timestamp:

Apr 29, 2016 11:18:03 AM (9 years ago)

Author:

vboxsync

Message:

Main/{USBProxyBackend|HostUSBDeviceImpl}: Don't hardcode certain host OS specific behavior during attach/release now that we can mix several backends with different requirements but make the backends report which behavior they need (should fix USB testing on Windows, OS X and Solaris hosts)

Location:

trunk/src/VBox/Main

Files:

• include/USBProxyBackend.h (modified) (4 diffs)
• src-server/HostUSBDeviceImpl.cpp (modified) (3 diffs)
• src-server/USBProxyBackend.cpp (modified) (1 diff)
• src-server/darwin/USBProxyBackendDarwin.cpp (modified) (1 diff)
• src-server/solaris/USBProxyBackendSolaris.cpp (modified) (1 diff)
• src-server/win/USBProxyBackendWindows.cpp (modified) (1 diff)

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

@@ -56 +56 @@
     virtual const com::Utf8Str &i_getBackend();
     uint32_t i_getRefCount();
+
+    virtual bool i_isDevReEnumerationRequired();
 
     /** @name Interface for the USBController and the Host object.
@@ -156 +158 @@
     virtual void releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess);
 
+    virtual bool i_isDevReEnumerationRequired();
+
 protected:
     virtual int wait(RTMSINTERVAL aMillies);
@@ -294 +298 @@
     virtual void releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess);
 
+    virtual bool i_isDevReEnumerationRequired();
+
 protected:
     virtual int wait(RTMSINTERVAL aMillies);
@@ -324 +330 @@
     virtual int captureDevice (HostUSBDevice *aDevice);
     virtual int releaseDevice (HostUSBDevice *aDevice);
+
+    virtual bool i_isDevReEnumerationRequired();
 
 protected:

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

@@ -469 +469 @@
      */
     LogFlowThisFunc(("{%s} capturing the device.\n", mName));
-#if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS) || defined(RT_OS_SOLARIS) /* PORTME */
-    i_setState(kHostUSBDeviceState_Capturing, kHostUSBDeviceState_UsedByVM, kHostUSBDeviceSubState_AwaitingDetach);
-#else
-    i_setState(kHostUSBDeviceState_Capturing, kHostUSBDeviceState_UsedByVM);
-#endif
+    if (mUSBProxyBackend->i_isDevReEnumerationRequired())
+        i_setState(kHostUSBDeviceState_Capturing, kHostUSBDeviceState_UsedByVM, kHostUSBDeviceSubState_AwaitingDetach);
+    else
+        i_setState(kHostUSBDeviceState_Capturing, kHostUSBDeviceState_UsedByVM);
+
     mMachine = aMachine;
     mMaskedIfs = aMaskedIfs;
@@ -731 +731 @@
      * Try release it.
      */
-#if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS) /* PORTME */
-    i_startTransition(kHostUSBDeviceState_ReleasingToHost, kHostUSBDeviceState_Unused, kHostUSBDeviceSubState_AwaitingDetach);
-#else
-    i_startTransition(kHostUSBDeviceState_ReleasingToHost, kHostUSBDeviceState_Unused);
-#endif
+    if (mUSBProxyBackend->i_isDevReEnumerationRequired())
+        i_startTransition(kHostUSBDeviceState_ReleasingToHost, kHostUSBDeviceState_Unused, kHostUSBDeviceSubState_AwaitingDetach);
+    else
+        i_startTransition(kHostUSBDeviceState_ReleasingToHost, kHostUSBDeviceState_Unused);
+
     alock.release();
     int rc = mUSBProxyBackend->releaseDevice(this);
@@ -784 +784 @@
      * Do the job.
      */
-#if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS) /* PORTME */
-    i_startTransition(kHostUSBDeviceState_Capturing, kHostUSBDeviceState_HeldByProxy, kHostUSBDeviceSubState_AwaitingDetach);
-#else
-    i_startTransition(kHostUSBDeviceState_Capturing, kHostUSBDeviceState_HeldByProxy);
-#endif
+    if (mUSBProxyBackend->i_isDevReEnumerationRequired())
+        i_startTransition(kHostUSBDeviceState_Capturing, kHostUSBDeviceState_HeldByProxy, kHostUSBDeviceSubState_AwaitingDetach);
+    else
+        i_startTransition(kHostUSBDeviceState_Capturing, kHostUSBDeviceState_HeldByProxy);
+
     alock.release();
     int rc = mUSBProxyBackend->captureDevice(this);

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

@@ -234 +234 @@
 
 bool USBProxyBackend::isFakeUpdateRequired()
+{
+    return false;
+}
+
+/**
+ * Returns whether devices reported by this backend go through a de/re-attach
+ * and device re-enumeration cycle when they are captured or released.
+ */
+bool USBProxyBackend::i_isDevReEnumerationRequired()
 {
     return false;

trunk/src/VBox/Main/src-server/darwin/USBProxyBackendDarwin.cpp

@@ -222 +222 @@
 
 
+/**
+ * Returns whether devices reported by this backend go through a de/re-attach
+ * and device re-enumeration cycle when they are captured or released.
+ */
+bool USBProxyBackendDarwin::i_isDevReEnumerationRequired()
+{
+    return true;
+}
+
+
 int USBProxyBackendDarwin::wait(RTMSINTERVAL aMillies)
 {

trunk/src/VBox/Main/src-server/solaris/USBProxyBackendSolaris.cpp

@@ -461 +461 @@
 
 /**
+ * Returns whether devices reported by this backend go through a de/re-attach
+ * and device re-enumeration cycle when they are captured or released.
+ */
+bool USBProxyBackendSolaris::i_isDevReEnumerationRequired()
+{
+    return true;
+}
+
+
+/**
  * Wrapper called by walkDeviceNode.
  *

trunk/src/VBox/Main/src-server/win/USBProxyBackendWindows.cpp

@@ -227 +227 @@
 
 
+/**
+ * Returns whether devices reported by this backend go through a de/re-attach
+ * and device re-enumeration cycle when they are captured or released.
+ */
+bool USBProxyBackendWindows::i_isDevReEnumerationRequired()
+{
+    return true;
+}
+
+
 int USBProxyBackendWindows::wait(unsigned aMillies)
 {