Changeset 5368 in vbox

Timestamp:

Oct 18, 2007 9:57:06 AM (18 years ago)

Author:

vboxsync

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

25436

Message:

Attempt to fix libhal cdrom and floppy detection

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (6 diffs)
• include/vbox-libhal.h (modified) (1 diff)
• linux/vbox-libhal.cpp (modified) (2 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1605 +1605 @@
                 {
                     int numDevices;
-                    char **halDevices = gLibHalFindDeviceByCapability(halContext,
-                                                "storage.cdrom", &numDevices, &dbusError);
+                    char **halDevices = gLibHalFindDeviceStringMatch(halContext,
+                                                "storage.drive_type", "cdrom",
+                                                &numDevices, &dbusError);
                     if (halDevices != 0)
                     {
@@ -1624 +1625 @@
                             if (devNode != 0)
                             {
-                                if (validateDevice(devNode, true))
-                                {
+//                                if (validateDevice(devNode, true))
+//                                {
                                     Utf8Str description;
                                     char *vendor, *product;
@@ -1674 +1675 @@
                                         gLibHalFreeString(product);
                                     }
-                                }
-                                else
-                                {
-                                    LogRel(("Host::COMGETTER(DVDDrives): failed to validate the block device %s as a DVD drive\n"));
-                                }
+//                                }
+//                                else
+//                                {
+//                                    LogRel(("Host::COMGETTER(DVDDrives): failed to validate the block device %s as a DVD drive\n"));
+//                                }
 #ifndef RT_OS_SOLARIS
                                 gLibHalFreeString(devNode);
@@ -1757 +1758 @@
                 {
                     int numDevices;
-                    char **halDevices = gLibHalFindDeviceByCapability(halContext,
-                                                "storage", &numDevices, &dbusError);
+                    char **halDevices = gLibHalFindDeviceStringMatch(halContext,
+                                                "storage.drive_type", "floppy",
+                                                &numDevices, &dbusError);
                     if (halDevices != 0)
                     {
@@ -1787 +1789 @@
                             if (devNode != 0)
                             {
-                                if (validateDevice(devNode, false))
-                                {
+//                                if (validateDevice(devNode, false))
+//                                {
                                     Utf8Str description;
                                     char *vendor, *product;
@@ -1837 +1839 @@
                                         gLibHalFreeString(product);
                                     }
-                                }
-                                else
-                                {
-                                    LogRel(("Host::COMGETTER(FloppyDrives): failed to validate the block device %s as a floppy drive\n"));
-                                }
+//                                }
+//                                else
+//                                {
+//                                    LogRel(("Host::COMGETTER(FloppyDrives): failed to validate the block device %s as a floppy drive\n"));
+//                                }
                                 gLibHalFreeString(devNode);
                             }

trunk/src/VBox/Main/include/vbox-libhal.h

@@ -53 +53 @@
 extern dbus_bool_t (*gLibHalCtxSetDBusConnection)(LibHalContext *, DBusConnection *);
 extern dbus_bool_t (*gLibHalCtxInit)(LibHalContext *, DBusError *);
-extern char **(*gLibHalFindDeviceByCapability)(LibHalContext *, const char *, int *, DBusError *);
+extern char **(*gLibHalFindDeviceStringMatch)(LibHalContext *, const char *, const char *, int *,
+               DBusError *);
 extern char *(*gLibHalDeviceGetPropertyString)(LibHalContext *, const char *, const char *,
                                               DBusError *);

trunk/src/VBox/Main/linux/vbox-libhal.cpp

@@ -47 +47 @@
 dbus_bool_t (*gLibHalCtxSetDBusConnection)(LibHalContext *, DBusConnection *);
 dbus_bool_t (*gLibHalCtxInit)(LibHalContext *, DBusError *);
-char **(*gLibHalFindDeviceByCapability)(LibHalContext *, const char *, int *, DBusError *);
+char **(*gLibHalFindDeviceStringMatch)(LibHalContext *, const char *, const char *, int *,
+        DBusError *);
 char *(*gLibHalDeviceGetPropertyString)(LibHalContext *, const char *, const char *, DBusError *);
 void (*gLibHalFreeString)(char *);
@@ -79 +80 @@
                                      (void **) &gLibHalCtxSetDBusConnection))
         && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_ctx_init", (void **) &gLibHalCtxInit))
-        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_find_device_by_capability",
-                                     (void **) &gLibHalFindDeviceByCapability))
+        && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_manager_find_device_string_match",
+                                     (void **) &gLibHalFindDeviceStringMatch))
         && RT_SUCCESS(RTLdrGetSymbol(hLibHal, "libhal_device_get_property_string",
                                      (void **) &gLibHalDeviceGetPropertyString))