Changeset 60089 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

Mar 18, 2016 10:51:02 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106086

Message:

Main,VBoxManage: Add API to IHost for adding and removing USB device sources in addition to the default host one (only USB/IP backend supported so far which will be used in the future for automatic USB testing). Add support for it in VBoxManage

File:

• trunk/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/linux/USBProxyBackendLinux.cpp

@@ -60 +60 @@
  * Initialize data members.
  */
-USBProxyBackendLinux::USBProxyBackendLinux(USBProxyService *aUsbProxyService)
-    : USBProxyBackend(aUsbProxyService), mhFile(NIL_RTFILE), mhWakeupPipeR(NIL_RTPIPE),
-      mhWakeupPipeW(NIL_RTPIPE), mUsingUsbfsDevices(true /* see init */),
-      mUdevPolls(0), mpWaiter(NULL)
-{
-    LogFlowThisFunc(("aUsbProxyService=%p\n", aUsbProxyService));
+USBProxyBackendLinux::USBProxyBackendLinux()
+    : USBProxyBackend(), mhWakeupPipeR(NIL_RTPIPE), mhWakeupPipeW(NIL_RTPIPE)
+{
+    LogFlowThisFunc(("\n"));
+}
+
+
+/**
+ * Stop all service threads and free the device chain.
+ */
+USBProxyBackendLinux::~USBProxyBackendLinux()
+{
+    LogFlowThisFunc(("\n"));
 }
 
@@ -73 +80 @@
  * @returns VBox status code.
  */
-int USBProxyBackendLinux::init(void)
-{
+int USBProxyBackendLinux::init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress)
+{
+    USBProxyBackend::init(pUsbProxyService, strId, strAddress);
+
     const char *pcszDevicesRoot;
     int rc = USBProxyLinuxChooseMethod(&mUsingUsbfsDevices, &pcszDevicesRoot);
@@ -88 +97 @@
 
     return rc;
+}
+
+void USBProxyBackendLinux::uninit()
+{
+    /*
+     * Stop the service.
+     */
+    if (isActive())
+        stop();
+
+    /*
+     * Free resources.
+     */
+    doUsbfsCleanupAsNeeded();
+#ifdef VBOX_USB_WITH_SYSFS
+    if (mpWaiter)
+        delete mpWaiter;
+#endif
+
+    USBProxyBackend::uninit();
 }
 
@@ -179 +208 @@
 
 /**
- * Stop all service threads and free the device chain.
- */
-USBProxyBackendLinux::~USBProxyBackendLinux()
-{
-    LogFlowThisFunc(("\n"));
-
-    /*
-     * Stop the service.
-     */
-    if (isActive())
-        stop();
-
-    /*
-     * Free resources.
-     */
-    doUsbfsCleanupAsNeeded();
-#ifdef VBOX_USB_WITH_SYSFS
-    if (mpWaiter)
-        delete mpWaiter;
-#endif
-}
-
-
-/**
  * If any Usbfs-related resources are currently allocated, then free them
  * and mark them as freed.
@@ -211 +216 @@
      * Free resources.
      */
-    RTFileClose(mhFile);
+    if (mhFile != NIL_RTFILE)
+        RTFileClose(mhFile);
     mhFile = NIL_RTFILE;
 
-    RTPipeClose(mhWakeupPipeR);
-    RTPipeClose(mhWakeupPipeW);
+    if (mhWakeupPipeR != NIL_RTPIPE)
+        RTPipeClose(mhWakeupPipeR);
+    if (mhWakeupPipeW != NIL_RTPIPE)
+        RTPipeClose(mhWakeupPipeW);
     mhWakeupPipeW = mhWakeupPipeR = NIL_RTPIPE;
 }