Changeset 8401 in vbox for trunk/src

Timestamp:

Apr 26, 2008 3:48:59 AM (17 years ago)

Author:

vboxsync

Message:

USB: Some review notes and method renaming.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (6 diffs)
• Makefile.kmk (modified) (1 diff)
• include/HostImpl.h (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1300 +1300 @@
             id.raw());
 
+/** @todo r=bird this doesn't belong here but in the HostUSBDevice bit. */
     AutoWriteLock devLock (device);
 
@@ -1333 +1334 @@
 
     /* try to capture the device */
-    device->requestCapture (aMachine);
+    device->requestCaptureForVM (aMachine);
 
     return S_OK;
@@ -2046 +2047 @@
 
     /// @todo it may be better to take a copy of filters to iterate and leave
-    /// the host lock before calling HostUSBDevice:requestCapture() (which
-    /// calls the VM process).
+    /// the host lock before calling HostUSBDevice:requestCaptureForVM() (which
+    /// may call the VM process).
+    /// Moving this matching into USBProxyService at the same time would be
+    /// nice too, that'll simplify the locking a bit more.
 
     /* apply global filters */
@@ -2061 +2064 @@
             if (action == USBDeviceFilterAction_Ignore)
             {
-                /* request to give the device back to the host*/
-                aDevice->requestRelease();
+                /* request to give the device back to the host */
+                aDevice->requestReleaseToHost();
                 /* nothing to do any more */
                 return S_OK;
@@ -2090 +2093 @@
             /* no any filter matched at all */
             /* request to give the device back to the host */
-            aDevice->requestRelease();
+            aDevice->requestReleaseToHost();
         }
         else
@@ -2137 +2140 @@
     if (hasMatch)
     {
+        /** @todo r=bird: this is wrong as requestAttachToVM may return false for different reasons that we. */
         /* try to capture the device */
-        return aDevice->requestCapture (aMachine, maskedIfs);
+        return aDevice->requestCaptureForVM (aMachine, maskedIfs);
     }
 

trunk/src/VBox/Main/Makefile.kmk

@@ -52 +52 @@
  endif
  VBOX_MAIN_DEFS += VBOX_WITH_UNIXY_TAP_NETWORKING
+endif
+ifeq ($(USERNAME),bird) # temporary
+ #VBOX_MAIN_DEFS += NEW_HOSTUSBDEVICE_STATE
 endif
 ## @todo later when RTSemRWIsWriteOwner and RTSemRWGetWriteRecursion are done

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

@@ -106 +106 @@
 
 #ifdef VBOX_WITH_USB
+    /** @todo We could benefit from moving all this USB management into USBProxyService
+     * instead of spreading out like this. Host only needs to keep the host filter list and make
+     * it available to the proxy service. Then only the proxy needs to be intimate friends
+     * with HostUSBDevice, which would simplify the overall picture a bit.
+     * But, I don't dare move anything about this right now though, as I have no time nor any
+     * wishes to provoke the deadlock troll so close to a release... */
     HRESULT onUSBDeviceFilterChange (HostUSBDeviceFilter *aFilter,
                                      BOOL aActiveChanged = FALSE);