Changeset 36994 in vbox

Timestamp:

May 6, 2011 10:20:05 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/usb: make unit tests pass and fix one test

Location:

trunk/src/VBox/Main

Files:

• src-server/linux/USBGetDevices.cpp (modified) (1 diff)
• src-server/linux/USBProxyServiceLinux.cpp (modified) (4 diffs)
• testcase/tstUSBProxyLinux.cpp (modified) (1 diff)

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

@@ -1499 +1499 @@
         PUSBDEVICE pDevices;
 
+        fOK = true;
         pDevices = getDevicesFromUsbfs(pcszRoot, true);
         if (pDevices)
         {
             PUSBDEVICE pDevice;
-            
-            fOK = true;
+
             for (pDevice = pDevices; pDevice && fOK; pDevice = pDevice->pNext)
                 if (access(pDevice->pszAddress, R_OK | W_OK))

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

@@ -115 +115 @@
      * In the event of both failing, an appropriate error will be returned.
      */
-    bool fUseSysfs;
+    bool fUsbfsChosen = false, fSysfsChosen = false;
     const char *pcszUsbFromEnv = RTEnvGet("VBOX_USB");
     const char *pcszUsbRoot = NULL;
@@ -126 +126 @@
         {
             LogRel(("Default USB access method set to \"usbfs\" from environment\n"));
-            fUseSysfs = false;
+            fUsbfsChosen = true;
         }
         else if (!RTStrICmp(pcszUsbFromEnv, "SYSFS"))
         {
             LogRel(("Default USB method set to \"sysfs\" from environment\n"));
-            fUseSysfs = true;
+            fSysfsChosen = true;
         }
         else
@@ -144 +144 @@
     if (!pcszUsbRoot)
     {
-        if (USBProxyLinuxCheckDeviceRoot("/dev/vboxusb", true))
-        {
-            fUseSysfs = true;
+        if (   !fUsbfsChosen
+            && USBProxyLinuxCheckDeviceRoot("/dev/vboxusb", true))
+        {
+            fSysfsChosen = true;
             pcszUsbRoot = "/dev/vboxusb";
         }
-        else if (USBProxyLinuxCheckDeviceRoot("/proc/bus/usb", false))
-        {
-            fUseSysfs = false;
+        else if (   !fSysfsChosen
+                 && USBProxyLinuxCheckDeviceRoot("/proc/bus/usb", false))
+        {
+            fUsbfsChosen = true;
             pcszUsbRoot = "/proc/bus/usb";
         }
@@ -157 +159 @@
     if (pcszUsbRoot)
     {
-        mUsingUsbfsDevices = !fUseSysfs;
+        mUsingUsbfsDevices = fUsbfsChosen;
         mDevicesRoot = pcszUsbRoot;
 #ifndef UNIT_TEST /* Hack for now */

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

@@ -91 +91 @@
     { "sysfs", "/dev/bus/usb", "/dev/usbvbox", false, "/proc/usb/bus", false, VINF_SUCCESS, VINF_SUCCESS, "/dev/bus/usb", false },
     { "sysfs", "/dev/bus/usb", "/dev/usbvbox", false, "/proc/usb/bus", false, VERR_NO_MEMORY, VERR_NO_MEMORY, "/dev/bus/usb", false },
-    { "sysfs", NULL, "/dev/usbvbox", true, NULL, false, VINF_SUCCESS, VINF_SUCCESS, "/dev/vboxusb", false },
+    { "sysfs", NULL, "/dev/vboxusb", true, NULL, false, VINF_SUCCESS, VINF_SUCCESS, "/dev/vboxusb", false },
     { "usbfs", "/dev/bus/usb", NULL, false, NULL, false, VINF_SUCCESS, VINF_SUCCESS, "/dev/bus/usb", true },
     { "usbfs", "/dev/bus/usb", NULL, false, NULL, false, VERR_NO_MEMORY, VERR_NO_MEMORY, "/dev/bus/usb", true },