Changeset 23382 in vbox

Timestamp:

Sep 28, 2009 2:04:05 PM (16 years ago)

Author:

vboxsync

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

52907

Message:

Main/HostHardwareLinux: test host floppy drives using an ioctl, not a property which wasn't present in sysfs in older kernels

File:

• trunk/src/VBox/Main/linux/HostHardwareLinux.cpp (modified) (3 diffs)

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

@@ -53 +53 @@
 # define _LINUX_BYTEORDER_SWABB_H
 # include <linux/cdrom.h>
+# include <linux/fd.h>
 # ifdef VBOX_WITH_DBUS
 #  include <vbox-dbus.h>
@@ -1304 +1305 @@
     void validateAndInitForFloppy()
     {
-        char szBus[128];
+        floppy_drive_name szName;
+        int rcIoCtl;
         if (   mpcszName[0] != 'f'
             || mpcszName[1] != 'd'
@@ -1311 +1313 @@
             || mpcszName[3] != '\0')
             return;
-        ssize_t cchBus = RTLinuxSysFsGetLinkDest(szBus, sizeof(szBus),
-                                                 "block/%s/device/bus",
-                                                 mpcszName);
-        if (cchBus < 0)
-            return;
-        if (strcmp(szBus, "platform") != 0)
+        RTFILE file;
+        int rc = RTFileOpen(&file, mszNode, RTFILE_O_READ);
+        /** @note the next line can produce a warning, as the ioctl request
+         * field is defined as signed, but the Linux ioctl definition macros
+         * produce unsigned constants. */
+        rc = RTFileIoCtl(file, FDGETDRVTYP, szName, 0, &rcIoCtl);
+        RTFileClose(file);
+        if (rcIoCtl < 0)
             return;
         misValid = true;