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

Timestamp:

May 4, 2011 2:50:32 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/USB: better permissions checking and code cleanup

Location:

trunk/src/VBox/Main/testcase

Files:

• tstHostHardwareLinux.cpp (modified) (1 diff)
• tstUSBProxyLinux.cpp (modified) (2 diffs)

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

@@ -128 +128 @@
         RTPrintf ("\n");
     }
-    PCUSBDEVTREELOCATION pcLocation = USBProxyLinuxGetDeviceRoot(false);
-    if (pcLocation && !pcLocation->fUseSysfs)
+    RTPrintf("NOTE: checking for usbfs at /dev/bus/usb, not /proc/bus/usb!!!\n");
+    if (USBProxyLinuxCheckDeviceRoot("/dev/bus/usb", false))
     {
-        PUSBDEVICE pDevice = USBProxyLinuxGetDevices(pcLocation->szDevicesRoot,
+        PUSBDEVICE pDevice = USBProxyLinuxGetDevices("/dev/bus/usb",
                                                      false);
-        printDevices(pDevice, pcLocation->szDevicesRoot, "usbfs");
+        printDevices(pDevice, "/dev/bus/usb", "usbfs");
         freeDevices(pDevice);
     }
+    else
+        RTPrintf("-> not found\n");
 #ifdef VBOX_USB_WITH_SYSFS
-    pcLocation = USBProxyLinuxGetDeviceRoot(true);
-    if (pcLocation && pcLocation->fUseSysfs)
+    RTPrintf("Testing for USB devices at /dev/vboxusb\n");
+    if (USBProxyLinuxCheckDeviceRoot("/dev/vboxusb", true))
     {
-        PUSBDEVICE pDevice = USBProxyLinuxGetDevices(pcLocation->szDevicesRoot,
+        PUSBDEVICE pDevice = USBProxyLinuxGetDevices("/dev/vboxusb",
                                                      true);
-        printDevices(pDevice, pcLocation->szDevicesRoot, "sysfs");
+        printDevices(pDevice, "/dev/vboxusb", "sysfs");
         freeDevices(pDevice);
     }
-    VBoxMainHotplugWaiter waiter(pcLocation->szDevicesRoot);
+    else
+        RTPrintf("-> not found\n");
+    VBoxMainHotplugWaiter waiter("/dev/vboxusb");
     RTPrintf ("Waiting for a hotplug event for five seconds...\n");
     doHotplugEvent(&waiter, 5000);

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

@@ -62 +62 @@
 }
 
-static USBDEVTREELOCATION s_deviceRoot = { "", false };
-static bool s_fGetDeviceRootPreferSysfs = false;
+static const char *s_pcszDeviceRoot = "";
+static bool s_fIsDeviceNodes = false;
 
-PCUSBDEVTREELOCATION USBProxyLinuxGetDeviceRoot(bool fPreferSysfs)
+bool USBProxyLinuxCheckDeviceRoot(const char *pcszRoot,
+                                  bool fIsDeviceNodes)
 {
-    s_fGetDeviceRootPreferSysfs = fPreferSysfs;
-    return &s_deviceRoot;
+    return (   (!strcmp(s_pcszDeviceRoot, pcszRoot))
+            && (s_fIsDeviceNodes == fIsDeviceNodes));
 }
 
@@ -153 +154 @@
         else
             RTEnvUnset("VBOX_USB_ROOT");
-        strcpy(s_deviceRoot.szDevicesRoot,
-               s_testEnvironment[i].pcszReturnedRoot);
-        s_deviceRoot.fUseSysfs = s_testEnvironment[i].fReturnedUseSysfs;
+        s_pcszDeviceRoot = s_testEnvironment[i].pcszReturnedRoot;
+        s_fIsDeviceNodes = s_testEnvironment[i].fReturnedUseSysfs;
         RTTESTI_CHECK(test.init() == S_OK);
         test.getDevices();