Changeset 8666 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

May 7, 2008 3:24:57 PM (17 years ago)

Author:

vboxsync

Message:

Removed the duplicate USB device list in Host and moved 4 methods over to USBProxyService.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7460 +7460 @@
         NOREF (rc);
 
-        mParent->host()->detachAllUSBDevices (this, true /* aDone */, true /* aAbnormal */);
+        USBProxyService *service = mParent->host()->usbProxyService();
+        if (service)
+            service->detachAllDevicesFromVM (this, true /* aDone */, true /* aAbnormal */);
     }
 #endif /* VBOX_WITH_USB */
@@ -7662 +7664 @@
 
 #ifdef VBOX_WITH_USB
-    /* if cautureUSBDevice() fails, it must have set extended error info */
-    return mParent->host()->captureUSBDevice (this, aId);
+    /* if captureDeviceForVM() fails, it must have set extended error info */
+    MultiResult rc = mParent->host()->checkUSBProxyService();
+    CheckComRCReturnRC (rc);
+
+    USBProxyService *service = mParent->host()->usbProxyService();
+    AssertReturn (service, E_FAIL);
+    return service->captureDeviceForVM (this, aId);
 #else
     return E_FAIL;
@@ -7680 +7687 @@
 
 #ifdef VBOX_WITH_USB
-    return mParent->host()->detachUSBDevice (this, aId, aDone);
+    USBProxyService *service = mParent->host()->usbProxyService();
+    AssertReturn (service, E_FAIL);
+    return service->detachDeviceFromVM (this, aId, aDone);
 #else
     return E_FAIL;
@@ -7706 +7715 @@
     NOREF (rc);
 
-    return mParent->host()->autoCaptureUSBDevices (this);
+    USBProxyService *service = mParent->host()->usbProxyService();
+    AssertReturn (service, E_FAIL);
+    return service->autoCaptureDevicesForVM (this);
 #else
     return S_OK;
@@ -7734 +7745 @@
     NOREF (rc);
 
-    return mParent->host()->detachAllUSBDevices (this, aDone, false /* aAbnormal */);
+    USBProxyService *service = mParent->host()->usbProxyService();
+    AssertReturn (service, E_FAIL);
+    return service->detachAllDevicesFromVM (this, aDone, false /* aAbnormal */);
 #else
     return S_OK;