Changeset 44173 in vbox for trunk/src/VBox/HostDrivers/Support/freebsd

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).

Location:

trunk/src/VBox/HostDrivers/Support/freebsd

Files:

• SUPDrv-freebsd.c (modified) (1 diff)
• SUPLib-freebsd.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c

@@ -230 +230 @@
      * Create a new session.
      */
-    rc = supdrvCreateSession(&g_VBoxDrvFreeBSDDevExt, true /* fUser */, &pSession);
+    rc = supdrvCreateSession(&g_VBoxDrvFreeBSDDevExt, true /* fUser */, true /*fUnrestricted*/, &pSession);
     if (RT_SUCCESS(rc))
     {

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

@@ -61 +61 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/** FreeBSD base 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"
 
 
 
-int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited)
+int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited, bool fUnrestricted)
 {
     /*
@@ -77 +79 @@
      * Try open the BSD 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)
     {
@@ -89 +91 @@
             default:        rc = VERR_VM_DRIVER_OPEN_ERROR; break;
         }
-        LogRel(("Failed to open \"%s\", errno=%d, rc=%Rrc\n", DEVICE_NAME, errno, rc));
+        LogRel(("Failed to open \"%s\", errno=%d, rc=%Rrc\n", fUnrestricted ? DEVICE_NAME_SYS : DEVICE_NAME_USR, errno, rc));
         return rc;
     }
@@ -112 +114 @@
      * We're done.
      */
-    pThis->hDevice = hDevice;
+    pThis->hDevice       = hDevice;
+    pThis->fUnrestricted = fUnrestricted;
     return VINF_SUCCESS;
 }