Changeset 44173 in vbox for trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp

Timestamp:

Dec 19, 2012 6:12:31 PM (12 years ago)

Author:

vboxsync

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

82883

Message:

SUPDrv,SUPLib: Introducing /dev/vboxdrvu on darwin (other platforms soon to follow).

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp (modified) (5 diffs)

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

@@ -62 +62 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/** Unix Device name. */
-#define DEVICE_NAME     "/dev/vboxdrv"
+/** System device name. */
+#define DEVICE_NAME_SYS     "/dev/vboxdrv"
+/** User device name. */
+#define DEVICE_NAME_USR     "/dev/vboxdrvu"
 
 /* define MADV_DONTFORK if it's missing from the system headers. */
@@ -72 +74 @@
 
 
-int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited)
+int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted)
 {
     /*
@@ -93 +95 @@
      * Try open the device.
      */
-    int hDevice = open(DEVICE_NAME, O_RDWR, 0);
+    int hDevice = open(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, O_RDWR, 0);
     if (hDevice < 0)
     {
@@ -99 +101 @@
          * Try load the device.
          */
-        hDevice = open(DEVICE_NAME, O_RDWR, 0);
+        hDevice = open(fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, O_RDWR, 0);
         if (hDevice < 0)
         {
@@ -133 +135 @@
      * We're done.
      */
-    pThis->hDevice = hDevice;
+    pThis->hDevice       = hDevice;
+    pThis->fUnrestricted = fUnrestricted;
     return VINF_SUCCESS;
 }