Changeset 19343 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

May 4, 2009 9:28:43 PM (16 years ago)

Author:

vboxsync

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

46830

Message:

Fixes for the kernel driver:

• Should compile with FreeBSD 8 (not tested)
• Fix IDC
• Drag in some functions we need for vboxnetflt

File:

• trunk/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c (modified) (6 diffs)

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

@@ -52 +52 @@
 #include <iprt/process.h>
 #include <iprt/assert.h>
+#include <iprt/uuid.h>
 #include <VBox/log.h>
 #include <iprt/alloc.h>
 #include <iprt/err.h>
 
+#ifdef VBOX_WITH_HARDENING
+# define VBOXDRV_PERM 0600
+#else
+# define VBOXDRV_PERM 0666
+#endif
 
 /*******************************************************************************
@@ -86 +92 @@
 /** Declare the module as a pseudo device. */
 DECLARE_MODULE(vboxdrv,     g_VBoxDrvFreeBSDModule, SI_SUB_PSEUDO, SI_ORDER_ANY);
+MODULE_VERSION(vboxdrv, 1); 
 
 /**
@@ -110 +117 @@
 static SUPDRVDEVEXT         g_VBoxDrvFreeBSDDevExt;
 
-
-
+/** Just a dummy global structure containing a bunch of
+ * function pointers to code which is wanted in the link.
+ */
+static PFNRT g_apfnVBoxDrvFreeBSDDeps[] =
+{
+    /* Needed for vboxnetflt. */
+    (PFNRT)RTUuidFromStr,
+    (PFNRT)RTUuidCompareStr,
+    NULL
+};
 
 /**
@@ -243 +258 @@
     if (rc)
     {
-#ifdef VBOX_WITH_HARDENING
-        *ppDev = make_dev(&g_VBoxDrvFreeBSDChrDevSW, unit2minor(iUnit), UID_ROOT, GID_WHEEL, 0600, "vboxdrv%d", iUnit);
+#if __FreeBSD_version > 800061
+        *ppDev = make_dev(&g_VBoxDrvFreeBSDChrDevSW, iUnit, UID_ROOT, GID_WHEEL, VBOXDRV_PERM, "vboxdrv%d", iUnit);
 #else
-        *ppDev = make_dev(&g_VBoxDrvFreeBSDChrDevSW, unit2minor(iUnit), UID_ROOT, GID_WHEEL, 0666, "vboxdrv%d", iUnit);
+        *ppDev = make_dev(&g_VBoxDrvFreeBSDChrDevSW, unit2minor(iUnit), UID_ROOT, GID_WHEEL, VBOXDRV_PERM, "vboxdrv%d", iUnit);
 #endif
         if (*ppDev)
@@ -546 +561 @@
         if (RT_UNLIKELY(!VALID_PTR(pReq->pSession)))
             return VERR_INVALID_PARAMETER;
-        if (RT_UNLIKELY(pSession->pDevExt != &g_VBoxDrvFreeBSDModule))
+        if (RT_UNLIKELY(pSession->pDevExt != &g_VBoxDrvFreeBSDDevExt))
             return VERR_INVALID_PARAMETER;
     }
@@ -555 +570 @@
      * Do the job.
      */
-    return supdrvIDC(uReq, &g_VBoxDrvFreeBSDModule, pSession, pReq);
+    return supdrvIDC(uReq, &g_VBoxDrvFreeBSDDevExt, pSession, pReq);
 }