Changeset 49840 in vbox

Timestamp:

Dec 9, 2013 1:31:05 PM (11 years ago)

Author:

vboxsync

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

91184

Message:

Support/solaris: Use /dev/vboxdrv[u] for non-global zones.

File:

• trunk/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp

@@ -53 +53 @@
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
+#include <sys/zone.h>
 
 #include <fcntl.h>
@@ -60 +61 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <zone.h>
 
 
@@ -65 +67 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/** @todo r=ramshankar: This breaks accessing the driver from non-global zones. We should check
-    using getzoneid() != GLOBAL_ZONE and use /dev/vboxdrv[u] instead when we're in a zone. */
 /** Solaris device link - system. */
-#define DEVICE_NAME_SYS     "/devices/pseudo/vboxdrv@0:vboxdrv"
+#define DEVICE_NAME_SYS       "/devices/pseudo/vboxdrv@0:vboxdrv"
 /** Solaris device link - user. */
-#define DEVICE_NAME_USR     "/devices/pseudo/vboxdrv@0:vboxdrvu"
+#define DEVICE_NAME_USR       "/devices/pseudo/vboxdrv@0:vboxdrvu"
+/** Solaris device link - system (non-global zone). */
+#define DEVICE_NAME_SYS_ZONE  "/dev/vboxdrv"
+/** Solaris device link - user (non-global zone). */
+#define DEVICE_NAME_USR_ZONE  "/dev/vboxdrvu"
 
 
@@ -106 +110 @@
      * Try to open the device.
      */
-    const char *pszDeviceNm = fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR;
+    const char *pszDeviceNm;
+    if (getzoneid() == GLOBAL_ZONEID)
+        pszDeviceNm = fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR;
+    else
+        pszDeviceNm = fUnrestricted ? DEVICE_NAME_SYS_ZONE : DEVICE_NAME_USR_ZONE;
     int hDevice = open(pszDeviceNm, O_RDWR, 0);
     if (hDevice < 0)