Changeset 10662 in vbox for trunk/src/VBox/HostDrivers/Support/darwin

Timestamp:

Jul 15, 2008 2:36:00 PM (17 years ago)

Author:

vboxsync

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

33373

Message:

Increased the IOC version to 7.4 with the exporting of SUPR0ComponentQueryFactory and friends. Added release logging to darwin, windows and freebsd.

File:

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

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

@@ +1 @@
+/* $Id: $ */
 /** @file
+ *
  * VBox host drivers - Ring-0 support drivers - Darwin host:
  * Darwin driver C code
@@ -29 +31 @@
  */
 
-
 /*******************************************************************************
 *   Header Files                                                               *
 *******************************************************************************/
+#define LOG_GROUP LOG_GROUP_SUP_DRV
 /*
  * Deal with conflicts first.
@@ -54 +56 @@
 #include <iprt/uuid.h>
 #include <iprt/err.h>
+#include <VBox/log.h>
 
 #include <mach/kmod.h>
@@ -219 +222 @@
 {
     int rc;
-    dprintf(("VBoxDrvDarwinStart\n"));
+#ifdef DEBUG
+    printf("VBoxDrvDarwinStart\n");
+#endif
 
     /*
@@ -251 +256 @@
                     if (g_hDevFsDevice)
                     {
-                        OSDBGPRINT(("VBoxDrv: Successfully started. (major=%d)\n", g_iMajorDeviceNo));
+                        LogRel(("VBoxDrv: version " VBOX_VERSION_STRING " r%d; IOCtl version %#x; IDC version %#x; dev major=%d\n",
+                                VBOX_SVN_REV, SUPDRVIOC_VERSION, SUPDRV_IDC_VERSION, g_iMajorDeviceNo));
                         return KMOD_RETURN_SUCCESS;
                     }
 
-                    OSDBGPRINT(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n",
-                                g_iMajorDeviceNo, DEVICE_NAME));
+                    LogRel(("VBoxDrv: devfs_make_node(makedev(%d,0),,,,%s) failed\n", g_iMajorDeviceNo, DEVICE_NAME));
                     cdevsw_remove(g_iMajorDeviceNo, &g_DevCW);
                     g_iMajorDeviceNo = -1;
                 }
                 else
-                    OSDBGPRINT(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
+                    LogRel(("VBoxDrv: cdevsw_add failed (%d)\n", g_iMajorDeviceNo));
                 RTSpinlockDestroy(g_Spinlock);
                 g_Spinlock = NIL_RTSPINLOCK;
             }
             else
-                OSDBGPRINT(("VBoxDrv: RTSpinlockCreate failed (rc=%d)\n", rc));
+                LogRel(("VBoxDrv: RTSpinlockCreate failed (rc=%d)\n", rc));
             supdrvDeleteDevExt(&g_DevExt);
         }
         else
-            OSDBGPRINT(("VBoxDrv: failed to initialize device extension (rc=%d)\n", rc));
+            printf("VBoxDrv: failed to initialize device extension (rc=%d)\n", rc);
         RTR0Term();
     }
     else
-        OSDBGPRINT(("VBoxDrv: failed to initialize IPRT (rc=%d)\n", rc));
+        printf("VBoxDrv: failed to initialize IPRT (rc=%d)\n", rc);
 
     memset(&g_DevExt, 0, sizeof(g_DevExt));
@@ -287 +292 @@
 {
     int rc;
-    dprintf(("VBoxDrvDarwinStop\n"));
+    LogFlow(("VBoxDrvDarwinStop\n"));
 
     /** @todo I've got a nagging feeling that we'll have to keep track of users and refuse
@@ -311 +316 @@
 
     memset(&g_DevExt, 0, sizeof(g_DevExt));
-    dprintf(("VBoxDrvDarwinStop - done\n"));
+#ifdef DEBUG
+    printf("VBoxDrvDarwinStop - done\n");
+#endif
     return KMOD_RETURN_SUCCESS;
 }
@@ -330 +337 @@
     szName[0] = '\0';
     proc_name(proc_pid(pProcess), szName, sizeof(szName));
-    dprintf(("VBoxDrvDarwinOpen: pid=%d '%s'\n", proc_pid(pProcess), szName));
+    Log(("VBoxDrvDarwinOpen: pid=%d '%s'\n", proc_pid(pProcess), szName));
 #endif
 
@@ -362 +369 @@
     OSDBGPRINT(("VBoxDrvDarwinOpen: pid=%d '%s' pSession=%p rc=%d\n", proc_pid(pProcess), szName, pSession, rc));
 #else
-    dprintf(("VBoxDrvDarwinOpen: g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, proc_pid(pProcess)));
+    Log(("VBoxDrvDarwinOpen: g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, proc_pid(pProcess)));
 #endif
     return VBoxDrvDarwinErr2DarwinErr(rc);
@@ -378 +385 @@
     PSUPDRVSESSION  pSession;
 
-    dprintf(("VBoxDrvDarwinClose: pid=%d\n", (int)Process));
+    Log(("VBoxDrvDarwinClose: pid=%d\n", (int)Process));
 
     /*
@@ -488 +495 @@
 static int VBoxDrvDarwinIOCtlSlow(PSUPDRVSESSION pSession, u_long iCmd, caddr_t pData, struct proc *pProcess)
 {
-    dprintf(("VBoxDrvDarwinIOCtlSlow: pSession=%p iCmd=%p pData=%p pProcess=%p\n", pSession, iCmd, pData, pProcess));
+    LogFlow(("VBoxDrvDarwinIOCtlSlow: pSession=%p iCmd=%p pData=%p pProcess=%p\n", pSession, iCmd, pData, pProcess));
 
 
@@ -571 +578 @@
     else
     {
-        dprintf(("VBoxDrvDarwinIOCtlSlow: huh? cbReq=%#x iCmd=%#lx\n", cbReq, iCmd));
+        Log(("VBoxDrvDarwinIOCtlSlow: huh? cbReq=%#x iCmd=%#lx\n", cbReq, iCmd));
         return EINVAL;
     }
@@ -617 +624 @@
         }
 
-        dprintf(("VBoxDrvDarwinIOCtlSlow: pid=%d iCmd=%lx pData=%p failed, rc=%d\n", proc_pid(pProcess), iCmd, (void *)pData, rc));
+        Log(("VBoxDrvDarwinIOCtlSlow: pid=%d iCmd=%lx pData=%p failed, rc=%d\n", proc_pid(pProcess), iCmd, (void *)pData, rc));
         rc = EINVAL;
     }
 
-    dprintf2(("VBoxDrvDarwinIOCtlSlow: returns %d\n", rc));
+    Log2(("VBoxDrvDarwinIOCtlSlow: returns %d\n", rc));
     return rc;
 }
@@ -778 +785 @@
 bool org_virtualbox_SupDrv::init(OSDictionary *pDictionary)
 {
-    dprintf(("org_virtualbox_SupDrv::init([%p], %p)\n", this, pDictionary));
+    LogFlow(("org_virtualbox_SupDrv::init([%p], %p)\n", this, pDictionary));
     if (IOService::init(pDictionary))
     {
@@ -793 +800 @@
 void org_virtualbox_SupDrv::free(void)
 {
-    dprintf(("IOService::free([%p])\n", this));
+    LogFlow(("IOService::free([%p])\n", this));
     IOService::free();
 }
@@ -804 +811 @@
 IOService *org_virtualbox_SupDrv::probe(IOService *pProvider, SInt32 *pi32Score)
 {
-    dprintf(("org_virtualbox_SupDrv::probe([%p])\n", this));
+    LogFlow(("org_virtualbox_SupDrv::probe([%p])\n", this));
     return IOService::probe(pProvider, pi32Score);
 }
@@ -814 +821 @@
 bool org_virtualbox_SupDrv::start(IOService *pProvider)
 {
-    dprintf(("org_virtualbox_SupDrv::start([%p])\n", this));
+    LogFlow(("org_virtualbox_SupDrv::start([%p])\n", this));
 
     if (IOService::start(pProvider))
@@ -831 +838 @@
 void org_virtualbox_SupDrv::stop(IOService *pProvider)
 {
-    dprintf(("org_virtualbox_SupDrv::stop([%p], %p)\n", this, pProvider));
+    LogFlow(("org_virtualbox_SupDrv::stop([%p], %p)\n", this, pProvider));
     IOService::stop(pProvider);
 }
@@ -845 +852 @@
 {
     bool fRc;
-    dprintf(("org_virtualbox_SupDrv::terminate: reference_count=%d g_cSessions=%d (fOptions=%#x)\n",
+    LogFlow(("org_virtualbox_SupDrv::terminate: reference_count=%d g_cSessions=%d (fOptions=%#x)\n",
              KMOD_INFO_NAME.reference_count, ASMAtomicUoReadS32(&g_cSessions), fOptions));
     if (    KMOD_INFO_NAME.reference_count != 0
@@ -852 +859 @@
     else
         fRc = IOService::terminate(fOptions);
-    dprintf(("org_virtualbox_SupDrv::terminate: returns %d\n", fRc));
+    LogFlow(("org_virtualbox_SupDrv::terminate: returns %d\n", fRc));
     return fRc;
 }
@@ -869 +876 @@
 bool org_virtualbox_SupDrvClient::initWithTask(task_t OwningTask, void *pvSecurityId, UInt32 u32Type)
 {
-    dprintf(("org_virtualbox_SupDrvClient::initWithTask([%p], %#x, %p, %#x)\n", this, OwningTask, pvSecurityId, u32Type));
+    LogFlow(("org_virtualbox_SupDrvClient::initWithTask([%p], %#x, %p, %#x)\n", this, OwningTask, pvSecurityId, u32Type));
 
     if (!OwningTask)
@@ -889 +896 @@
 bool org_virtualbox_SupDrvClient::start(IOService *pProvider)
 {
-    dprintf(("org_virtualbox_SupDrvClient::start([%p], %p)\n", this, pProvider));
+    LogFlow(("org_virtualbox_SupDrvClient::start([%p], %p)\n", this, pProvider));
     if (IOUserClient::start(pProvider))
     {
@@ -898 +905 @@
             return true;
         }
-        dprintf(("org_virtualbox_SupDrvClient::start: %p isn't org_virtualbox_SupDrv\n", pProvider));
+        LogFlow(("org_virtualbox_SupDrvClient::start: %p isn't org_virtualbox_SupDrv\n", pProvider));
     }
     return false;
@@ -909 +916 @@
 IOReturn org_virtualbox_SupDrvClient::clientClose(void)
 {
-    dprintf(("org_virtualbox_SupDrvClient::clientClose([%p])\n", this));
+    LogFlow(("org_virtualbox_SupDrvClient::clientClose([%p])\n", this));
 
     m_pProvider = NULL;
@@ -923 +930 @@
 IOReturn org_virtualbox_SupDrvClient::clientDied(void)
 {
-    dprintf(("org_virtualbox_SupDrvClient::clientDied([%p]) m_Task=%p R0Process=%p Process=%d\n",
+    LogFlow(("org_virtualbox_SupDrvClient::clientDied([%p]) m_Task=%p R0Process=%p Process=%d\n",
              this, m_Task, RTR0ProcHandleSelf(), RTProcSelf()));
 
@@ -937 +944 @@
         for (PSUPDRVSESSION pSession = g_apSessionHashTab[i]; pSession; pSession = pSession->pNextHash)
         {
-            dprintf2(("pSession=%p R0Process=%p (=? %p)\n", pSession, pSession->R0Process, R0Process));
+            Log2(("pSession=%p R0Process=%p (=? %p)\n", pSession, pSession->R0Process, R0Process));
             if (pSession->R0Process == R0Process)
             {
@@ -963 +970 @@
 bool org_virtualbox_SupDrvClient::terminate(IOOptionBits fOptions)
 {
-    dprintf(("org_virtualbox_SupDrvClient::terminate([%p], %#x)\n", this, fOptions));
+    LogFlow(("org_virtualbox_SupDrvClient::terminate([%p], %#x)\n", this, fOptions));
     return IOUserClient::terminate(fOptions);
 }
@@ -973 +980 @@
 bool org_virtualbox_SupDrvClient::finalize(IOOptionBits fOptions)
 {
-    dprintf(("org_virtualbox_SupDrvClient::finalize([%p], %#x)\n", this, fOptions));
+    LogFlow(("org_virtualbox_SupDrvClient::finalize([%p], %#x)\n", this, fOptions));
     return IOUserClient::finalize(fOptions);
 }
@@ -983 +990 @@
 void org_virtualbox_SupDrvClient::stop(IOService *pProvider)
 {
-    dprintf(("org_virtualbox_SupDrvClient::stop([%p])\n", this));
+    LogFlow(("org_virtualbox_SupDrvClient::stop([%p])\n", this));
     IOUserClient::stop(pProvider);
 }