Changeset 2917 in vbox

Timestamp:

May 29, 2007 2:17:19 PM (18 years ago)

Author:

vboxsync

Message:

Updated the host DVD code on Linux to use hal for device detection

Location:

trunk

Files:

• configure (modified) (7 diffs)
• src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h (modified) (4 diffs)
• src/VBox/Main/HostDVDDriveImpl.cpp (modified) (2 diffs)
• src/VBox/Main/HostImpl.cpp (modified) (3 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)
• src/VBox/Main/include/HostDVDDriveImpl.h (modified) (2 diffs)
• src/VBox/Main/include/HostImpl.h (modified) (1 diff)

trunk/configure

@@ -30 +30 @@
 WITH_QT=1
 WITH_SDL_TTF=1
+WITH_HAL=1
 CC="gcc"
 CXX="g++"
@@ -54 +55 @@
 INCPNG=""
 LIBPNG="-lpng"
+CFLAGSHAL="-I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include"
+LIBHAL="-lhal -ldbus-1"
 QTDIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3"
 KBUILDDIR="`cd $(dirname $0); pwd`/kBuild"
@@ -999 +1002 @@
 
 #
+# Check for the libhal library for obtaining hardware information on Linux
+#
+function check_libhal()
+{
+  test_header libhal
+  pc_cflagshal=`pkg-config hal --cflags 2>/dev/null`
+  pc_libhal=`pkg-config hal --libs 2>/dev/null`
+  if [ ! -z "$pc_cflagshal" ]
+  then # is this acceptable?
+      CFLAGSHAL=$pc_cflagshal
+      LIBHAL=$pc_libhal
+  fi
+  echo '
+#include <cstdio>
+#include <libhal.h>
+extern "C" int main(void)
+{
+  DBusError dbusError;
+  dbus_error_init (&dbusError);
+  LibHalContext *halContext = libhal_ctx_new();
+  if (halContext != 0)
+  {
+      libhal_ctx_free(halContext);
+  }
+  return 0;
+}
+' > .tmp_src.cc
+  if test_compile "$CFLAGSHAL $LIBHAL" libhal libhal; then
+    log_success "found"
+    cnf_append "LIB_HAL_CFLAGS" "$CFLAGSHAL"
+    cnf_append "LIB_HAL_LIBS" `echo $LIBHAL | sed 's+-l++g'`
+    cnf_append "VBOX_WITH_LIBHAL" "1"
+  fi
+}
+
+
+#
 # Show help
 #
@@ -1012 +1052 @@
   --disable-sdl-ttf       disable SDL_ttf detection
   --build-xalan           build xalan & xerces from shipped sources
+  --without-hal           do not use libhal, even if it is available
 
 Paths:
-  --with-gcc=PATH         position of the gcc compiler [$CC]
-  --with-g++=PATH         position of the g++ compiler [$CXX]
+  --with-gcc=PATH         location of the gcc compiler [$CC]
+  --with-g++=PATH         location of the g++ compiler [$CXX]
   --with-kbuild=DIR       kbuild directory [$KBUILDDIR]
-  --with-iasl=PATH        the position of the iasl compiler [$IASL]
+  --with-iasl=PATH        location of the iasl compiler [$IASL]
+  --with-hal-cflags=FLAGS cflags for libhal [$CFLAGSHAL]
+  --with-hal=LIB          location of the libhal libraries [$LIBHAL]
   --with-linux=DIR        Linux kernel source directory [$LINUX]
-  --with-mkisofs=PATH     position of mkisofs [$MKISOFS]
+  --with-mkisofs=PATH     location of mkisofs [$MKISOFS]
   --with-qt-dir=DIR       directory for QT headers/libraries [$QTDIR]
-  --with-xalan=LIB        position of the xalan library [$LIBXALAN]
-  --with-xerces=LIB       position of the xerces library [$LIBXERCES]
+  --with-xalan=LIB        location of the xalan library [$LIBXALAN]
+  --with-xerces=LIB       location of the xerces library [$LIBXERCES]
 
 Build type:
@@ -1060 +1103 @@
       QTDIR=`echo $option | cut -d'=' -f2`
       ;;
+    --with-hal-dir=*)
+      INCHAL=`echo $option | cut -d'=' -f2`
+      ;;
+    --with-hal=*)
+      LIBHAL=`echo $option | cut -d'=' -f2`
+      ;;
     --with-iasl=*)
       IASL=`echo $option | cut -d'=' -f2`
@@ -1083 +1132 @@
     --disable-qt)
       WITH_QT=0
+      ;;
+    --without-hal)
+      WITH_HAL=0
       ;;
     --build-debug|-d)
@@ -1207 +1259 @@
 [ "$OS" = "linux" ] && check_linux
 [ "$OS" = "linux" ] && check_compiler_h
+[ "$OS" = "linux" -a "$WITH_HAL" = "1" ] && check_libhal
 
 # success!

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1552 +1552 @@
         {
             case CEnums::HostDriveCaptured:
-                name = tr ("Host Drive ", "DVD-ROM tooltip") +
-                    dvd.GetHostDrive().GetName();
+            {
+                QString description = dvd.GetHostDrive().GetDescription();
+                if (description.isEmpty())
+                {
+                    name = tr ("Host Drive ", "DVD-ROM tooltip") +
+                        dvd.GetHostDrive().GetName();
+                }
+                else
+                {
+                    name = tr ("Host Drive ", "DVD-ROM tooltip") +
+                        description;
+                }
                 break;
+            }
             case CEnums::ImageMounted:
                 name = dvd.GetImage().GetFilePath();
@@ -2187 +2198 @@
         CHostDVDDrive hostDVD = en.GetNext();
         /** @todo set icon */
-        int id = devicesMountDVDMenu->insertItem (
-            tr ("Host Drive ") + hostDVD.GetName()
-        );
+        QString description = hostDVD.GetDescription();
+        int id;
+        if (description.isEmpty())
+        {
+            id = devicesMountDVDMenu->insertItem (
+                tr ("Host Drive ") + hostDVD.GetName()
+                );
+        }
+        else
+        {
+            id = devicesMountDVDMenu->insertItem (
+                tr ("Host Drive ") + description
+                );
+        }
         hostDVDMap [id] = hostDVD;
         if (machine_state != CEnums::Running)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1173 +1173 @@
             {
                 CHostDVDDrive drv = dvd.GetHostDrive();
+                QString description = drv.GetDescription();
+                if (description.isEmpty())
+                {
                 item = item.arg (tr ("Host Drive", "details report (DVD)"),
                                  drv.GetName());
+                }
+                else
+                {
+                item = item.arg (tr ("Host Drive", "details report (DVD)"),
+                                 description);
+                }
                 break;
             }

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -1426 +1426 @@
             CHostDVDDrive hostDVD = en.GetNext();
             /// @todo (r=dmik) set icon?
-            cbHostDVD->insertItem (hostDVD.GetName(), id);
+            QString description = hostDVD.GetDescription();
+            if (description.isEmpty())
+            {
+                cbHostDVD->insertItem (hostDVD.GetName(), id);
+            }
+            else
+            {
+                cbHostDVD->insertItem (description, id);
+            }
             hostDVDs [id] = hostDVD;
             ++ id;
@@ -1438 +1446 @@
                 CHostDVDDrive drv = dvd.GetHostDrive();
                 QString name = drv.GetName();
+                QString description = drv.GetDescription();
                 if (coll.FindByName (name).isNull())
                 {
@@ -1444 +1453 @@
                      *  add it to the end of the list with a special mark
                      */
-                    cbHostDVD->insertItem ("* " + name);
+                    if (description.isEmpty())
+                    {
+                        cbHostDVD->insertItem ("* " + name);
+                    }
+                    else
+                    {
+                        cbHostDVD->insertItem ("* " + description);
+                    }
                     cbHostDVD->setCurrentItem (cbHostDVD->count() - 1);
                 }
@@ -1450 +1466 @@
                 {
                     /* this will select the correct item from the prepared list */
-                    cbHostDVD->setCurrentText (name);
+                    if (description.isEmpty())
+                    {
+                        cbHostDVD->setCurrentText (name);
+                    }
+                    else
+                    {
+                        cbHostDVD->setCurrentText (description);
+                    }
                 }
                 rbHostDVD->setChecked (true);

trunk/src/VBox/Main/HostDVDDriveImpl.cpp

@@ -52 +52 @@
 }
 
+/**
+ * Initializes the host object.
+ *
+ * @returns COM result indicator
+ * @param driveName        name of the drive
+ * @param driveDescription human readable description of the drive
+ */
+HRESULT HostDVDDrive::init (INPTR BSTR driveName, INPTR BSTR driveDescription)
+{
+    ComAssertRet (driveName, E_INVALIDARG);
+    ComAssertRet (driveDescription, E_INVALIDARG);
+
+    AutoLock lock(this);
+    mDriveName = driveName;
+    mDriveDescription = driveDescription;
+    setReady(true);
+    return S_OK;
+}
+
 // IHostDVDDrive properties
 /////////////////////////////////////////////////////////////////////////////
@@ -70 +89 @@
     return S_OK;
 }
+
+/**
+ * Returns the description of the host drive
+ *
+ * @returns COM status code
+ * @param driveDescription address of result pointer
+ */
+STDMETHODIMP HostDVDDrive::COMGETTER(Description) (BSTR *driveDescription)
+{
+    if (!driveDescription)
+        return E_POINTER;
+    AutoLock lock(this);
+    CHECK_READY();
+    mDriveDescription.cloneTo(driveDescription);
+    return S_OK;
+}

trunk/src/VBox/Main/HostImpl.cpp

@@ -31 +31 @@
 #define _LINUX_BYTEORDER_GENERIC_H
 #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
+#endif
 #include <errno.h>
 #endif /* __LINUX __ */
@@ -190 +196 @@
     delete[] hostDrives;
 #elif defined(__LINUX__)
-    // On Linux, the situation is much more complex. There is no simple API so
-    // we will take a more creative approach. As there is only a heuristical
-    // approach on Linux, we'll allow the user to specify a list of host CDROMs
-    // using and an environment variable.
+#ifdef VBOX_USE_LIBHAL
+    if (!getDVDInfoFromHal(list)) /* Playing with #defines in this way is nasty, I know. */
+#endif /* USE_LIBHAL defined */
+    // On Linux without hal, the situation is much more complex. We will take a
+    // heuristical approach and also allow the user to specify a list of host
+    // CDROMs using an environment variable.
     // The general strategy is to try some known device names and see of they
     // exist. At last, we'll enumerate the /etc/fstab file (luckily there's an
     // API to parse it) for CDROM devices. Ok, let's start!
 
-    if (getenv("VBOX_CDROM"))
-    {
-        char *cdromEnv = strdupa(getenv("VBOX_CDROM"));
-        char *cdromDrive;
-        cdromDrive = strtok(cdromEnv, ":");
-        while (cdromDrive)
-        {
-            if (validateDevice(cdromDrive, true))
+    {
+        if (getenv("VBOX_CDROM"))
+        {
+            char *cdromEnv = strdupa(getenv("VBOX_CDROM"));
+            char *cdromDrive;
+            cdromDrive = strtok(cdromEnv, ":");
+            while (cdromDrive)
             {
-                ComObjPtr <HostDVDDrive> hostDVDDriveObj;
-                hostDVDDriveObj.createObject();
-                hostDVDDriveObj->init (Bstr (cdromDrive));
-                list.push_back (hostDVDDriveObj);
+                if (validateDevice(cdromDrive, true))
+                {
+                    ComObjPtr <HostDVDDrive> hostDVDDriveObj;
+                    hostDVDDriveObj.createObject();
+                    hostDVDDriveObj->init (Bstr (cdromDrive));
+                    list.push_back (hostDVDDriveObj);
+                }
+                cdromDrive = strtok(NULL, ":");
             }
-            cdromDrive = strtok(NULL, ":");
-        }
-    }
-    else
-    {
-        // this is a good guess usually
-        if (validateDevice("/dev/cdrom", true))
-        {
-                ComObjPtr <HostDVDDrive> hostDVDDriveObj;
-                hostDVDDriveObj.createObject();
-                hostDVDDriveObj->init (Bstr ("/dev/cdrom"));
-                list.push_back (hostDVDDriveObj);
-        }
-
-        // check the mounted drives
-        parseMountTable((char*)"/etc/mtab", list);
-
-        // check the drives that can be mounted
-        parseMountTable((char*)"/etc/fstab", list);
+        }
+        else
+        {
+            // this is a good guess usually
+            if (validateDevice("/dev/cdrom", true))
+            {
+                    ComObjPtr <HostDVDDrive> hostDVDDriveObj;
+                    hostDVDDriveObj.createObject();
+                    hostDVDDriveObj->init (Bstr ("/dev/cdrom"));
+                    list.push_back (hostDVDDriveObj);
+            }
+
+            // check the mounted drives
+            parseMountTable((char*)"/etc/mtab", list);
+
+            // check the drives that can be mounted
+            parseMountTable((char*)"/etc/fstab", list);
+        }
     }
 #elif defined(__DARWIN__)
@@ -1380 +1390 @@
 
 #ifdef __LINUX__
+# ifdef VBOX_USE_LIBHAL
+/**
+ * Helper function to query the hal subsystem for information about DVD drives attached to the
+ * system.
+ *
+ * @returns true if at least one drive was found, false otherwise
+ * @retval  list drives found will be attached to this list
+ */
+bool Host::getDVDInfoFromHal(std::list <ComObjPtr <HostDVDDrive> > &list)
+{
+    bool halSuccess = false;
+    DBusError dbusError;
+    dbus_error_init (&dbusError);
+    DBusConnection *dbusConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbusError);
+    if (dbusConnection != 0)
+    {
+        LibHalContext *halContext = libhal_ctx_new();
+        if (halContext != 0)
+        {
+            if (libhal_ctx_set_dbus_connection (halContext, dbusConnection))
+            {
+                if (libhal_ctx_init(halContext, &dbusError))
+                {
+                    int numDevices;
+                    char **halDevices = libhal_find_device_by_capability(halContext,
+                                                "storage.cdrom", &numDevices, &dbusError);
+                    if (halDevices != 0)
+                    {
+                        for (int i = 0; i < numDevices; i++)
+                        {
+                            char *devNode = libhal_device_get_property_string(halContext,
+                                                    halDevices[i], "block.device", &dbusError);
+                            if (devNode != 0)
+                            {
+                                if (validateDevice(devNode, true))
+                                {
+                                    char description[256];
+                                    char *vendor, *product;
+                                    /* We have at least one hit, so operation successful :) */
+                                    halSuccess = true;
+                                    vendor = libhal_device_get_property_string(halContext,
+                                                    halDevices[i], "info.vendor", &dbusError);
+                                    product = libhal_device_get_property_string(halContext,
+                                                    halDevices[i], "info.product", &dbusError);
+                                    if ((product != 0))
+                                    {
+                                        if (vendor != 0 && vendor[0] != 0)
+                                        {
+                                            RTStrPrintf(description, sizeof(description),
+                                                        "%s %s (%s)", vendor, product, devNode);
+                                        }
+                                        else
+                                        {
+                                            RTStrPrintf(description, sizeof(description),
+                                                        "%s (%s)", product, devNode);
+                                        }
+                                        ComObjPtr <HostDVDDrive> hostDVDDriveObj;
+                                        hostDVDDriveObj.createObject();
+                                        hostDVDDriveObj->init (Bstr (devNode), Bstr (description));
+                                        list.push_back (hostDVDDriveObj);
+                                    }
+                                    else
+                                    {
+                                        ComObjPtr <HostDVDDrive> hostDVDDriveObj;
+                                        hostDVDDriveObj.createObject();
+                                        hostDVDDriveObj->init (Bstr (devNode));
+                                        list.push_back (hostDVDDriveObj);
+                                    }
+                                }
+                                else
+                                {
+                                    LogRel(("Host::COMGETTER(DVDDrives): failed to validate the block device %s as a DVD drive\n"));
+                                }
+                                libhal_free_string(devNode);
+                            }
+                            else
+                            {
+                                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);
+                            }
+                        }
+                        libhal_free_string_array(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);
+                    }
+                    if (!libhal_ctx_shutdown(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);
+                    }
+                }
+                else
+                {
+                    LogRel(("Host::COMGETTER(DVDDrives): failed to initialise libhal context.  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
+                    dbus_error_free(&dbusError);
+                }
+                libhal_ctx_free(halContext);
+            }
+            else
+            {
+                LogRel(("Host::COMGETTER(DVDDrives): failed to set libhal connection to dbus.\n"));
+            }
+        }
+        else
+        {
+            LogRel(("Host::COMGETTER(DVDDrives): failed to get a libhal context - out of memory?\n"));
+        }
+        dbus_connection_unref(dbusConnection);
+    }
+    else
+    {
+        LogRel(("Host::COMGETTER(DVDDrives): failed to connect to dbus.  dbus error: %s (%s)\n", dbusError.name, dbusError.message));
+        dbus_error_free(&dbusError);
+    }
+    return halSuccess;
+}
+# endif  /* VBOX_USE_HAL defined */
+
 /**
  * Helper function to parse the given mount file and add found entries

trunk/src/VBox/Main/Makefile.kmk

@@ -153 +153 @@
         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
 endif
+ifdef VBOX_WITH_LIBHAL
+VBoxSVC_CXXFLAGS += \
+        $(LIB_HAL_CFLAGS)
+VBoxSVC_LIBS += \
+        $(LIB_HAL_LIBS)
+VBoxSVC_DEFS += \
+        VBOX_USE_LIBHAL
+endif
+
 VBoxSVC_SOURCES = \
         Logging.cpp \

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3499 +3499 @@
             <desc>Returns the platform device identifier.</desc>
         </attribute>
+        <attribute name="description" type="wstring" readonly="yes">
+            <desc>Returns a human readable description for the drive.</desc>
+        </attribute>
 
     </interface>

trunk/src/VBox/Main/include/HostDVDDriveImpl.h

@@ -50 +50 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init (INPTR BSTR driveName);
+    HRESULT init (INPTR BSTR driveName, INPTR BSTR driveDescription);
 
     // IHostDVDDrive properties
     STDMETHOD(COMGETTER(Name)) (BSTR *driveName);
+    STDMETHOD(COMGETTER(Description)) (BSTR *driveDescription);
 
     // public methods for internal purposes only
@@ -64 +66 @@
 
     Bstr mDriveName;
+    Bstr mDriveDescription;
 };
 

trunk/src/VBox/Main/include/HostImpl.h

@@ -131 +131 @@
 
 #ifdef __LINUX__
+# ifdef VBOX_USE_LIBHAL
+    bool getDVDInfoFromHal(std::list <ComObjPtr <HostDVDDrive> > &list);
+# endif
     void parseMountTable(char *mountTable, std::list <ComObjPtr <HostDVDDrive> > &list);
     bool validateDevice(const char *deviceNode, bool isCDROM);