Changeset 59117 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Dec 14, 2015 2:04:37 PM (9 years ago)

Author:

vboxsync

Message:

USB,Main: Rework USBProxyService. Split it into a USBProxyService and USBProxyBackend class, USBProxyService can use multiple USBProxyBackend instances as sources for USB devices to attach to a VM which will be used for USB/IP support. Change the PDM USB API to contain a backend parameter instead of a remote flag to indicate the USB backend to use for the given device.

Location:

trunk/src/VBox/Main/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstUSBProxyLinux.cpp (modified) (4 diffs)

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -208 +208 @@
 tstUSBProxyLinux_SOURCES   = \
         tstUSBProxyLinux.cpp \
-        ../src-server/linux/USBProxyServiceLinux.cpp \
+        ../src-server/linux/USBProxyBackendLinux.cpp \
         ../src-server/linux/USBGetDevices.cpp
 tstUSBProxyLinux_INCS      = \

trunk/src/VBox/Main/testcase/tstUSBProxyLinux.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * USBProxyServiceLinux test case.
+ * USBProxyBackendLinux test case.
  */
 
@@ -21 +21 @@
 *********************************************************************************************************************************/
 
-#include "USBProxyService.h"
+#include "USBProxyBackend.h"
 #include "USBGetDevices.h"
 
@@ -32 +32 @@
 /*** BEGIN STUBS ***/
 
-USBProxyService::USBProxyService(Host*) {}
-USBProxyService::~USBProxyService() {}
-HRESULT USBProxyService::init() { return S_OK; }
-int USBProxyService::start() { return VINF_SUCCESS; }
-int USBProxyService::stop() { return VINF_SUCCESS; }
-RWLockHandle *USBProxyService::lockHandle() const { return NULL; }
-void *USBProxyService::insertFilter(USBFILTER const*) { return NULL; }
-void USBProxyService::removeFilter(void*) {}
-int USBProxyService::captureDevice(HostUSBDevice*) { return VINF_SUCCESS; }
-void USBProxyService::captureDeviceCompleted(HostUSBDevice*, bool) {}
-void USBProxyService::detachingDevice(HostUSBDevice*) {}
-int USBProxyService::releaseDevice(HostUSBDevice*) { return VINF_SUCCESS; }
-void USBProxyService::releaseDeviceCompleted(HostUSBDevice*, bool) {}
-void USBProxyService::serviceThreadInit() {}
-void USBProxyService::serviceThreadTerm() {}
-int USBProxyService::wait(unsigned int) { return VINF_SUCCESS; }
-int USBProxyService::interruptWait() { return VINF_SUCCESS; }
-PUSBDEVICE USBProxyService::getDevices() { return NULL; }
-void USBProxyService::deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice) {}
-void USBProxyService::deviceRemoved(ComObjPtr<HostUSBDevice> &aDevice) {}
-void USBProxyService::deviceChanged(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList*, SessionMachine*) {}
-bool USBProxyService::updateDeviceState(HostUSBDevice*, USBDEVICE*, bool*, SessionMachine**) { return true; }
-bool USBProxyService::updateDeviceStateFake(HostUSBDevice*, USBDEVICE*, bool*, SessionMachine**) { return true; }
-bool USBProxyService::isActive() { return true; }
+USBProxyBackend::USBProxyBackend(USBProxyService*) {}
+USBProxyBackend::~USBProxyBackend() {}
+int USBProxyBackend::init() { return VINF_SUCCESS; }
+int USBProxyBackend::start() { return VINF_SUCCESS; }
+int USBProxyBackend::stop() { return VINF_SUCCESS; }
+RWLockHandle *USBProxyBackend::lockHandle() const { return NULL; }
+void *USBProxyBackend::insertFilter(USBFILTER const*) { return NULL; }
+void USBProxyBackend::removeFilter(void*) {}
+int USBProxyBackend::captureDevice(HostUSBDevice*) { return VINF_SUCCESS; }
+void USBProxyBackend::captureDeviceCompleted(HostUSBDevice*, bool) {}
+void USBProxyBackend::detachingDevice(HostUSBDevice*) {}
+int USBProxyBackend::releaseDevice(HostUSBDevice*) { return VINF_SUCCESS; }
+void USBProxyBackend::releaseDeviceCompleted(HostUSBDevice*, bool) {}
+void USBProxyBackend::serviceThreadInit() {}
+void USBProxyBackend::serviceThreadTerm() {}
+int USBProxyBackend::wait(unsigned int) { return VINF_SUCCESS; }
+int USBProxyBackend::interruptWait() { return VINF_SUCCESS; }
+PUSBDEVICE USBProxyBackend::getDevices() { return NULL; }
+void USBProxyBackend::deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice) {}
+void USBProxyBackend::deviceRemoved(ComObjPtr<HostUSBDevice> &aDevice) {}
+void USBProxyBackend::deviceChanged(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList*, SessionMachine*) {}
+bool USBProxyBackend::updateDeviceState(HostUSBDevice*, USBDEVICE*, bool*, SessionMachine**) { return true; }
+bool USBProxyBackend::updateDeviceStateFake(HostUSBDevice*, USBDEVICE*, bool*, SessionMachine**) { return true; }
+bool USBProxyBackend::isActive() { return true; }
 
 VBoxMainHotplugWaiter::VBoxMainHotplugWaiter(char const*) {}
@@ -62 +62 @@
 {
     return Utf8Str();
-}
-
-int USBProxyService::getLastError(void)
-{
-    return mLastError;
 }