Changeset 2141 in vbox for trunk

Timestamp:

Apr 17, 2007 7:42:19 PM (18 years ago)

Author:

vboxsync

Message:

Made the device node 0666 for now. Fixed some logging.

File:

• trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp (modified) (12 diffs)

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -219 +219 @@
                 if (g_iMajorDeviceNo >= 0)
                 {
+                    /** @todo the UID, GID and mode mask should be configurable! This isn't very secure... */
                     g_hDevFsDevice = devfs_make_node(makedev(g_iMajorDeviceNo, 0), DEVFS_CHAR,
-                                                     UID_ROOT, GID_WHEEL, 0660, DEVICE_NAME); /** @todo the UID and GID should be configurable! */
+                                                     UID_ROOT, GID_WHEEL, 0666, DEVICE_NAME);
                     if (g_hDevFsDevice)
                     {
@@ -299 +300 @@
     int                 rc;
     PSUPDRVSESSION      pSession;
-    dprintf(("VBoxSupDrvOpen:\n"));
+#ifdef DEBUG
+    char szName[128];
+    szName[0] = '\0';
+    proc_name(proc_pid(pProcess), szName, sizeof(szName));
+    dprintf(("VBoxSupDrvOpen: pid=%d '%s'\n", proc_pid(pProcess), szName));
+#endif
 
     /*
@@ -328 +334 @@
     }
 
+#if 1
     dprintf(("VBoxSupDrvOpen: g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, proc_pid(pProcess)));
-
+#else
+    OSDBGPRINT(("VBoxSupDrvOpen: pid=%d '%s' pSession=%p rc=%d\n", proc_pid(pProcess), szName, pSession, rc));
+#endif
     return VBoxSupDrvErr2DarwinErr(rc);
 }
@@ -380 +389 @@
     if (!pSession)
     {
-        OSDBGPRINT(("VBoxSupDrvIoctl: WHUT?!? pSession == NULL! This must be a mistake... pid=%d\n", (int)Process));
+        OSDBGPRINT(("VBoxSupDrvClose: WHAT?!? pSession == NULL! This must be a mistake... pid=%d (close)\n", 
+                    (int)Process));
         return EINVAL;
     }
@@ -422 +432 @@
     if (!pSession)
     {
-        OSDBGPRINT(("VBoxSupDrvIoctl: WHUT?!? pSession == NULL! This must be a mistake... pid=%d\n", (int)Process));
+        OSDBGPRINT(("VBoxSupDrvIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x\n", 
+                    (int)Process, iCmd));
         return EINVAL;
     }
@@ -456 +467 @@
     unsigned            cbOut = 0;
     PSUPDRVIOCTLDATA    pArgs = (PSUPDRVIOCTLDATA)pData;
-    dprintf(("VBoxSupDrvIOCtl: pSession=%p iCmd=%p pData=%p pProcess=%p\n", pSession, iCmd, pData, pProcess));
+    dprintf(("VBoxSupDrvIOCtlSlow: pSession=%p iCmd=%p pData=%p pProcess=%p\n", pSession, iCmd, pData, pProcess));
 
     /*
@@ -463 +474 @@
     if (IOCPARM_LEN(iCmd) != sizeof(SUPDRVIOCTLDATA))
     {
-        dprintf(("VBoxSupDrvIOCtl: incorrect input length! cbArgs=%d\n", IOCPARM_LEN(iCmd)));
+        dprintf(("VBoxSupDrvIOCtlSlow: incorrect input length! cbArgs=%d\n", IOCPARM_LEN(iCmd)));
         return EINVAL;
     }
@@ -478 +489 @@
         if (pvBuf == NULL)
         {
-            dprintf(("VBoxSupDrvIOCtl: failed to allocate buffer of %d bytes.\n", cbBuf));
+            dprintf(("VBoxSupDrvIOCtlSlow: failed to allocate buffer of %d bytes.\n", cbBuf));
             return ENOMEM;
         }
@@ -484 +495 @@
         if (rc)
         {
-            dprintf(("VBoxSupDrvIOCtl: copyin(%p,,%d) failed.\n", pArgs->pvIn, cbBuf));
+            dprintf(("VBoxSupDrvIOCtlSlow: copyin(%p,,%d) failed.\n", pArgs->pvIn, cbBuf));
             if (pvPageBuf)
                 IOFreeAligned(pvPageBuf, cbBuf);
@@ -504 +515 @@
     if (rc)
     {
-        dprintf(("VBoxSupDrvIOCtl: pid=%d iCmd=%x pData=%p failed, rc=%d (darwin rc=%d)\n",
+        dprintf(("VBoxSupDrvIOCtlSlow: pid=%d iCmd=%x pData=%p failed, rc=%d (darwin rc=%d)\n",
                  proc_pid(pProcess), iCmd, (void *)pData, rc, VBoxSupDrvErr2DarwinErr(rc)));
         rc = VBoxSupDrvErr2DarwinErr(rc);
@@ -515 +526 @@
             if (rc2)
             {
-                dprintf(("VBoxSupDrvIOCtl: copyout(,%p,%d) failed.\n", pArgs->pvOut, cbBuf));
+                dprintf(("VBoxSupDrvIOCtlSlow: copyout(,%p,%d) failed.\n", pArgs->pvOut, cbBuf));
                 rc = rc2;
             }
@@ -531 +542 @@
         RTMemTmpFree(pvBuf);
 
-    dprintf2(("VBoxSupDrvIOCtl: returns %d\n", rc));
+    dprintf2(("VBoxSupDrvIOCtlSlow: returns %d\n", rc));
     return rc;
 }