Changeset 28781 in vbox

Timestamp:

Apr 26, 2010 8:49:54 PM (15 years ago)

Author:

vboxsync

Message:

Main/HostHardwareLinux: disable USB probing using hal/DBus by default

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• linux/HostHardwareLinux.cpp (modified) (12 diffs)
• testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -222 +222 @@
         $(if $(VBOX_WITH_RESOURCE_USAGE_API),VBOX_WITH_RESOURCE_USAGE_API,) \
         $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
-        $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
+        $(if $(VBOX_WITH_DBUS),$(if $(VBOX_USB_WITH_DBUS),VBOX_USB_WITH_DBUS,),) \
         $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
         $(if $(VBOX_USB_WITH_FAM),VBOX_USB_WITH_FAM,) \

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -33 +33 @@
 #include <VBox/log.h>
 
-#ifdef VBOX_WITH_DBUS
+#ifdef VBOX_USB_WITH_DBUS
 # include <VBox/dbus.h>
 #endif
@@ -100 +100 @@
 static int getUSBDeviceInfoFromSysfs(USBDeviceInfoList *pList, bool *pfSuccess);
 # endif
-# ifdef VBOX_WITH_DBUS
+# ifdef VBOX_USB_WITH_DBUS
 /* These must be extern to be usable in the RTMemAutoPtr template */
 extern void VBoxHalShutdown (DBusConnection *pConnection);
@@ -136 +136 @@
 static DBusHandlerResult dbusFilterFunction (DBusConnection *pConnection,
                                              DBusMessage *pMessage, void *pvUser);
-# endif  /* VBOX_WITH_DBUS */
+# endif  /* VBOX_USB_WITH_DBUS */
 #endif /* VBOX_USB_WITH_SYSFS */
 
@@ -1031 +1031 @@
         mDeviceList.clear();
 #ifdef VBOX_USB_WITH_SYSFS
-# ifdef VBOX_WITH_DBUS
+# ifdef VBOX_USB_WITH_DBUS
         bool halSuccess = false;
         if (   RT_SUCCESS(rc)
@@ -1043 +1043 @@
         if (!success)
             success = halSuccess;
-# endif /* VBOX_WITH_DBUS */
+# endif /* VBOX_USB_WITH_DBUS */
 # ifdef VBOX_USB_WITH_FAM
         if (   RT_SUCCESS(rc)
@@ -1061 +1061 @@
 }
 
-#if defined VBOX_USB_WITH_SYSFS && defined VBOX_WITH_DBUS
+#if defined VBOX_USB_WITH_SYSFS && defined VBOX_USB_WITH_DBUS
 class hotplugDBusImpl : public VBoxMainHotplugWaiterImpl
 {
@@ -1168 +1168 @@
     mInterrupt = true;
 }
-#endif  /* VBOX_USB_WITH_SYSFS && VBOX_WITH_DBUS */
+#endif  /* VBOX_USB_WITH_SYSFS && VBOX_USB_WITH_DBUS */
 
 class hotplugNullImpl : public VBoxMainHotplugWaiterImpl
@@ -1349 +1349 @@
         Assert(!RTFileExists("/proc/bus/usb/devices"));
 #   endif
-#   ifdef VBOX_WITH_DBUS
+#   ifdef VBOX_USB_WITH_DBUS
         Assert(!hotplugDBusImpl::HalAvailable());
 #   endif
@@ -1502 +1502 @@
 {
 #ifdef VBOX_USB_WITH_SYSFS
-# ifdef VBOX_WITH_DBUS
+# ifdef VBOX_USB_WITH_DBUS
     if (hotplugDBusImpl::HalAvailable())
     {
@@ -1508 +1508 @@
         return;
     }
-# endif  /* VBOX_WITH_DBUS */
+# endif  /* VBOX_USB_WITH_DBUS */
 # ifdef VBOX_USB_WITH_FAM
     if (hotplugSysfsFAMImpl::SysfsAvailable())
@@ -1760 +1760 @@
 #endif /* VBOX_USB_WITH_SYSFS */
 
-#if defined VBOX_USB_WITH_SYSFS && defined VBOX_WITH_DBUS
+#if defined VBOX_USB_WITH_SYSFS && defined VBOX_USB_WITH_DBUS
 /** Wrapper class around DBusError for automatic cleanup */
 class autoDBusError
@@ -2529 +2529 @@
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
-#endif  /* VBOX_USB_WITH_SYSFS && VBOX_WITH_DBUS */
-
+#endif  /* VBOX_USB_WITH_SYSFS && VBOX_USB_WITH_DBUS */
+

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

@@ -132 +132 @@
         TESTCASE \
         $(if $(VBOX_WITH_LINUX_COMPILER_H),VBOX_WITH_LINUX_COMPILER_H,) \
-        $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
+        $(if $(VBOX_WITH_DBUS),$(if $(VBOX_USB_WITH_DBUS),VBOX_USB_WITH_DBUS,),) \
         $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
         $(if $(VBOX_USB_WITH_FAM),VBOX_USB_WITH_FAM,)