Changeset 31373 in vbox for trunk/src/VBox/Main/HostImpl.cpp

Timestamp:

Aug 4, 2010 7:05:14 PM (15 years ago)

Author:

vboxsync

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

64430

Message:

Main/HostImpl: Solaris DVD drive enumeration fix.

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -66 +66 @@
 # include <stdio.h>
 # include <libdevinfo.h>
+# include <sys/mkdev.h>
 # include <sys/scsi/generic/inquiry.h>
 # include <net/if.h>
@@ -2021 +2022 @@
                      * slice that represents the whole drive. "s2" is always the whole drive for CD/DVDs.
                      */
+                    int Major = di_driver_major(Node);
                     di_minor_t Minor = DI_MINOR_NIL;
                     di_devlink_handle_t DevLink = di_devlink_init(NULL /* name */, 0 /* flags */);
@@ -2027 +2029 @@
                         while ((Minor = di_minor_next(Node, Minor)) != DI_MINOR_NIL)
                         {
+                            dev_t Dev = di_minor_devt(Minor);
+                            if (   Major != (int)major(Dev)
+                                || di_minor_spectype(Minor) == S_IFCHR
+                                || di_minor_type(Minor) != DDM_MINOR)
+                            {
+                                continue;
+                            }
+
                             char *pszMinorPath = di_devfs_minor_path(Minor);
                             if (!pszMinorPath)
@@ -2057 +2067 @@
                             }
                         }
+                        di_devlink_fini(&DevLink);
                     }
                 }