Changeset 3934 in vbox for trunk/src

Timestamp:

Jul 31, 2007 8:36:16 AM (17 years ago)

Author:

vboxsync

Message:

Switched to runtime detection and loading of dbus and libhal on Linux hosts (in Main)

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (21 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -32 +32 @@
 #include <linux/cdrom.h>
 #ifdef VBOX_USE_LIBHAL
-# include <libhal.h>
-/* These are defined by libhal.h and by VBox header files. */
-# undef TRUE
-# undef FALSE
+// # include <libhal.h>
+// /* These are defined by libhal.h and by VBox header files. */
+// # undef TRUE
+// # undef FALSE
+#include "vbox-libhal.h"
 #endif
 #include <errno.h>
@@ -1530 +1531 @@
     bool halSuccess = false;
     DBusError dbusError;
-    dbus_error_init (&dbusError);
-    DBusConnection *dbusConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbusError);
+    if (!LibHalCheckPresence())
+        return false;
+    DBusErrorInit (&dbusError);
+    DBusConnection *dbusConnection = DBusBusGet(DBUS_BUS_SYSTEM, &dbusError);
     if (dbusConnection != 0)
     {
-        LibHalContext *halContext = libhal_ctx_new();
+        LibHalContext *halContext = LibHalCtxNew();
         if (halContext != 0)
         {
-            if (libhal_ctx_set_dbus_connection (halContext, dbusConnection))
+            if (LibHalCtxSetDBusConnection (halContext, dbusConnection))
             {
-                if (libhal_ctx_init(halContext, &dbusError))
+                if (LibHalCtxInit(halContext, &dbusError))
                 {
                     int numDevices;
-                    char **halDevices = libhal_find_device_by_capability(halContext,
+                    char **halDevices = LibHalFindDeviceByCapability(halContext,
                                                 "storage.cdrom", &numDevices, &dbusError);
                     if (halDevices != 0)
@@ -1551 +1554 @@
                         for (int i = 0; i < numDevices; i++)
                         {
-                            char *devNode = libhal_device_get_property_string(halContext,
+                            char *devNode = LibHalDeviceGetPropertyString(halContext,
                                                     halDevices[i], "block.device", &dbusError);
                             if (devNode != 0)
@@ -1561 +1564 @@
                                     /* We do not check the error here, as this field may
                                        not even exist. */
-                                    vendor = libhal_device_get_property_string(halContext,
+                                    vendor = LibHalDeviceGetPropertyString(halContext,
                                                     halDevices[i], "info.vendor", 0);
-                                    product = libhal_device_get_property_string(halContext,
+                                    product = LibHalDeviceGetPropertyString(halContext,
                                                     halDevices[i], "info.product", &dbusError);
                                     if ((product != 0 && product[0] != 0))
@@ -1589 +1592 @@
                                             LogRel(("Host::COMGETTER(DVDDrives): failed to get property \"info.product\" for device %s.  dbus error: %s (%s)\n",
                                                     halDevices[i], dbusError.name, dbusError.message));
-                                            dbus_error_free(&dbusError);
+                                            DBusErrorFree(&dbusError);
                                         }
                                         ComObjPtr <HostDVDDrive> hostDVDDriveObj;
@@ -1599 +1602 @@
                                     if (vendor != 0)
                                     {
-                                        libhal_free_string(vendor);
+                                        LibHalFreeString(vendor);
                                     }
                                     if (product != 0)
                                     {
-                                        libhal_free_string(product);
+                                        LibHalFreeString(product);
                                     }
                                 }
@@ -1610 +1613 @@
                                     LogRel(("Host::COMGETTER(DVDDrives): failed to validate the block device %s as a DVD drive\n"));
                                 }
-                                libhal_free_string(devNode);
+                                LibHalFreeString(devNode);
                             }
                             else
@@ -1616 +1619 @@
                                 LogRel(("Host::COMGETTER(DVDDrives): failed to get property \"block.device\" for device %s.  dbus error: %s (%s)\n",
                                         halDevices[i], dbusError.name, dbusError.message));
-                                dbus_error_free(&dbusError);
+                                DBusErrorFree(&dbusError);
                             }
                         }
-                        libhal_free_string_array(halDevices);
+                        LibHalFreeStringArray(halDevices);
                     }
                     else
                     {
                         LogRel(("Host::COMGETTER(DVDDrives): failed to get devices with capability \"storage.cdrom\".  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
-                        dbus_error_free(&dbusError);
+                        DBusErrorFree(&dbusError);
                     }
-                    if (!libhal_ctx_shutdown(halContext, &dbusError))  /* what now? */
+                    if (!LibHalCtxShutdown(halContext, &dbusError))  /* what now? */
                     {
                         LogRel(("Host::COMGETTER(DVDDrives): failed to shutdown the libhal context.  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
-                        dbus_error_free(&dbusError);
+                        DBusErrorFree(&dbusError);
                     }
                 }
@@ -1635 +1638 @@
                 {
                     LogRel(("Host::COMGETTER(DVDDrives): failed to initialise libhal context.  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
-                    dbus_error_free(&dbusError);
+                    DBusErrorFree(&dbusError);
                 }
-                libhal_ctx_free(halContext);
+                LibHalCtxFree(halContext);
             }
             else
@@ -1648 +1651 @@
             LogRel(("Host::COMGETTER(DVDDrives): failed to get a libhal context - out of memory?\n"));
         }
-        dbus_connection_unref(dbusConnection);
+        DBusConnectionUnref(dbusConnection);
     }
     else
     {
         LogRel(("Host::COMGETTER(DVDDrives): failed to connect to dbus.  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
-        dbus_error_free(&dbusError);
+        DBusErrorFree(&dbusError);
     }
     return halSuccess;
@@ -1670 +1673 @@
     bool halSuccess = false;
     DBusError dbusError;
-    dbus_error_init (&dbusError);
-    DBusConnection *dbusConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbusError);
+    if (!LibHalCheckPresence())
+        return false;
+    DBusErrorInit (&dbusError);
+    DBusConnection *dbusConnection = DBusBusGet(DBUS_BUS_SYSTEM, &dbusError);
     if (dbusConnection != 0)
     {
-        LibHalContext *halContext = libhal_ctx_new();
+        LibHalContext *halContext = LibHalCtxNew();
         if (halContext != 0)
         {
-            if (libhal_ctx_set_dbus_connection (halContext, dbusConnection))
+            if (LibHalCtxSetDBusConnection (halContext, dbusConnection))
             {
-                if (libhal_ctx_init(halContext, &dbusError))
+                if (LibHalCtxInit(halContext, &dbusError))
                 {
                     int numDevices;
-                    char **halDevices = libhal_find_device_by_capability(halContext,
+                    char **halDevices = LibHalFindDeviceByCapability(halContext,
                                                 "storage", &numDevices, &dbusError);
                     if (halDevices != 0)
@@ -1691 +1696 @@
                         for (int i = 0; i < numDevices; i++)
                         {
-                            char *driveType = libhal_device_get_property_string(halContext,
+                            char *driveType = LibHalDeviceGetPropertyString(halContext,
                                                     halDevices[i], "storage.drive_type", 0);
                             if (driveType != 0)
@@ -1697 +1702 @@
                                 if (strcmp(driveType, "floppy") != 0)
                                 {
-                                    libhal_free_string(driveType);
+                                    LibHalFreeString(driveType);
                                     continue;
                                 }
-                                libhal_free_string(driveType);
+                                LibHalFreeString(driveType);
                             }
                             else
@@ -1708 +1713 @@
                                 continue;
                             }
-                            char *devNode = libhal_device_get_property_string(halContext,
+                            char *devNode = LibHalDeviceGetPropertyString(halContext,
                                                     halDevices[i], "block.device", &dbusError);
                             if (devNode != 0)
@@ -1718 +1723 @@
                                     /* We do not check the error here, as this field may
                                        not even exist. */
-                                    vendor = libhal_device_get_property_string(halContext,
+                                    vendor = LibHalDeviceGetPropertyString(halContext,
                                                     halDevices[i], "info.vendor", 0);
-                                    product = libhal_device_get_property_string(halContext,
+                                    product = LibHalDeviceGetPropertyString(halContext,
                                                     halDevices[i], "info.product", &dbusError);
                                     if ((product != 0) && (product[0] != 0))
@@ -1746 +1751 @@
                                             LogRel(("Host::COMGETTER(FloppyDrives): failed to get property \"info.product\" for device %s.  dbus error: %s (%s)\n",
                                                     halDevices[i], dbusError.name, dbusError.message));
-                                            dbus_error_free(&dbusError);
+                                            DBusErrorFree(&dbusError);
                                         }
                                         ComObjPtr <HostFloppyDrive> hostFloppyDrive;
@@ -1756 +1761 @@
                                     if (vendor != 0)
                                     {
-                                        libhal_free_string(vendor);
+                                        LibHalFreeString(vendor);
                                     }
                                     if (product != 0)
                                     {
-                                        libhal_free_string(product);
+                                        LibHalFreeString(product);
                                     }
                                 }
@@ -1767 +1772 @@
                                     LogRel(("Host::COMGETTER(FloppyDrives): failed to validate the block device %s as a floppy drive\n"));
                                 }
-                                libhal_free_string(devNode);
+                                LibHalFreeString(devNode);
                             }
                             else
@@ -1773 +1778 @@
                                 LogRel(("Host::COMGETTER(FloppyDrives): failed to get property \"block.device\" for device %s.  dbus error: %s (%s)\n",
                                         halDevices[i], dbusError.name, dbusError.message));
-                                dbus_error_free(&dbusError);
+                                DBusErrorFree(&dbusError);
                             }
                         }
-                        libhal_free_string_array(halDevices);
+                        LibHalFreeStringArray(halDevices);
                     }
                     else
                     {
                         LogRel(("Host::COMGETTER(FloppyDrives): failed to get devices with capability \"storage.cdrom\".  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
-                        dbus_error_free(&dbusError);
+                        DBusErrorFree(&dbusError);
                     }
-                    if (!libhal_ctx_shutdown(halContext, &dbusError))  /* what now? */
+                    if (!LibHalCtxShutdown(halContext, &dbusError))  /* what now? */
                     {
                         LogRel(("Host::COMGETTER(FloppyDrives): failed to shutdown the libhal context.  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
-                        dbus_error_free(&dbusError);
+                        DBusErrorFree(&dbusError);
                     }
                 }
@@ -1792 +1797 @@
                 {
                     LogRel(("Host::COMGETTER(FloppyDrives): failed to initialise libhal context.  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
-                    dbus_error_free(&dbusError);
+                    DBusErrorFree(&dbusError);
                 }
-                libhal_ctx_free(halContext);
+                LibHalCtxFree(halContext);
             }
             else
@@ -1805 +1810 @@
             LogRel(("Host::COMGETTER(FloppyDrives): failed to get a libhal context - out of memory?\n"));
         }
-        dbus_connection_unref(dbusConnection);
+        DBusConnectionUnref(dbusConnection);
     }
     else
     {
         LogRel(("Host::COMGETTER(FloppyDrives): failed to connect to dbus.  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
-        dbus_error_free(&dbusError);
+        DBusErrorFree(&dbusError);
     }
     return halSuccess;

trunk/src/VBox/Main/Makefile.kmk

@@ -129 +129 @@
 VBoxSVC_DEFS.win.x86 += _WIN32_WINNT=0x0500
 VBoxSVC_DEFS.win.amd64 += _WIN32_WINNT=0x0510
+VBoxSVC_DEFS.linux += VBOX_USE_LIBHAL
+
 VBoxSVC_INCS = \
         include \
@@ -146 +148 @@
         $(LIB_VMM) \
         $(LIB_REM)
-
-ifdef VBOX_WITH_LIBHAL
-VBoxSVC_CXXFLAGS += \
-        $(LIB_HAL_CFLAGS)
-VBoxSVC_LIBPATH += \
-        $(LIB_HAL_LIBPATH)
-VBoxSVC_LIBS += \
-        $(LIB_HAL_LIBS)
-VBoxSVC_DEFS += \
-        VBOX_USE_LIBHAL
-endif
 
 VBoxSVC_SOURCES = \
@@ -203 +194 @@
         win32/VBoxSVC.rc
 
+VBoxSVC_SOURCES.linux = \
+        linux/vbox-libhal.cpp
+
 ifdef VBOX_WITH_XPCOM
 VBoxSVC_SOURCES += \