Changeset 48034 in vbox for trunk/src/VBox

Timestamp:

Aug 23, 2013 4:03:04 PM (11 years ago)

Author:

vboxsync

Message:

Guest Additions: add release logger to VBoxGuest driver (enabled for darwin only); make VBoxGuest.kext workable on 64 bit system.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/Makefile.kmk (modified) (1 diff)
• VBoxGuest/VBoxGuest-darwin.cpp (modified) (4 diffs)
• VBoxGuest/VBoxGuest.cpp (modified) (6 diffs)
• VBoxGuestLib/HGCMInternal.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -39 +39 @@
  VBoxGuest_DEFS.solaris  = VBOX_SVN_REV=$(VBOX_SVN_REV)
  VBoxGuest_DEFS.win      = # VBOX_WITH_VRDP_SESSION_HANDLING
+ VBoxGuest_DEFS.darwin   = VBOX_GUESTDRV_WITH_RELEASE_LOGGER
  ifeq ($(KBUILD_TYPE),release)
   # Allow stopping/removing the driver without a reboot

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-darwin.cpp

@@ -799 +799 @@
                                 /* register the service. */
                                 registerService();
-                                printf("VBoxGuest: Successfully started I/O kit class instance.\n");
+                                LogRel(("VBoxGuest: Successfully started I/O kit class instance.\n"));
                                 return true;
                             }
 
-                            printf("VBoxGuest: Failed to set up interrupts\n");
+                            LogRel(("VBoxGuest: Failed to set up interrupts\n"));
                             VbgdDarwinCharDevRemove();
                         }
                         else
-                            printf("VBoxGuest: Failed to initialize character device (rc=%d).\n", rc);
+                            LogRel(("VBoxGuest: Failed to initialize character device (rc=%d).\n", rc));
 
                         VBoxGuestDeleteDevExt(&g_DevExt);
                     }
                     else
-                        printf("VBoxGuest: Failed to initialize common code (rc=%d).\n", rc);
+                        LogRel(("VBoxGuest: Failed to initialize common code (rc=%d).\n", rc));
 
                     if (m_pMap)
@@ -822 +822 @@
             }
             else
-                printf("VBoxGuest: The device missing is the I/O port range (#0).\n");
+                LogRel(("VBoxGuest: The device missing is the I/O port range (#0).\n"));
         }
         else
-            printf("VBoxGuest: Not the VMMDev (%#x:%#x).\n",
-                   m_pIOPCIDevice->configRead16(kIOPCIConfigVendorID), m_pIOPCIDevice->configRead16(kIOPCIConfigDeviceID));
+            LogRel(("VBoxGuest: Not the VMMDev (%#x:%#x).\n",
+                   m_pIOPCIDevice->configRead16(kIOPCIConfigVendorID), m_pIOPCIDevice->configRead16(kIOPCIConfigDeviceID)));
     }
     else
-        printf("VBoxGuest: Provider is not an instance of IOPCIDevice.\n");
+        LogRel(("VBoxGuest: Provider is not an instance of IOPCIDevice.\n"));
 
     ASMAtomicXchgBool(&g_fInstantiated, false);
@@ -850 +850 @@
     /* Low level termination should be performed only once */
     if (!disableVmmDevInterrupts())
-        printf("vboxguest: unable to unregister interrupt handler\n");
+        LogRel(("vboxguest: unable to unregister interrupt handler\n"));
 
     VbgdDarwinCharDevRemove();
@@ -865 +865 @@
     ASMAtomicWriteBool(&g_fInstantiated, false);
 
-    printf("vboxguest module unloaded\n");
+    LogRel(("vboxguest module unloaded\n"));
 }
 

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -751 +751 @@
     unsigned i;
 
+#ifdef VBOX_GUESTDRV_WITH_RELEASE_LOGGER
+    /*
+     * Create the release log.
+     */
+    static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
+    PRTLOGGER pRelLogger;
+    rc = RTLogCreate(&pRelLogger, 0 /* fFlags */, "all",
+                     "VBOX_RELEASE_LOG", RT_ELEMENTS(s_apszGroups), s_apszGroups, RTLOGDEST_STDOUT | RTLOGDEST_DEBUGGER, NULL);
+    if (RT_SUCCESS(rc))
+        RTLogRelSetDefaultInstance(pRelLogger);
+    /** @todo Add native hook for getting logger config parameters and setting
+     *        them. On linux we should use the module parameter stuff... */
+#endif
+
     /*
      * Adjust fFixedEvents.
@@ -905 +919 @@
     rc2 = RTSpinlockDestroy(pDevExt->EventSpinlock); AssertRC(rc2);
     rc2 = RTSpinlockDestroy(pDevExt->SessionSpinlock); AssertRC(rc2);
+
+#ifdef VBOX_GUESTDRV_WITH_RELEASE_LOGGER
+    RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
+    RTLogDestroy(RTLogSetDefaultInstance(NULL));
+#endif
     return rc; /* (failed) */
 }
@@ -974 +993 @@
     pDevExt->IOPortBase = 0;
     pDevExt->pIrqAckEvents = NULL;
+
+#ifdef VBOX_GUESTDRV_WITH_RELEASE_LOGGER
+    RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
+    RTLogDestroy(RTLogSetDefaultInstance(NULL));
+#endif
+
 }
 
@@ -1385 +1410 @@
     if (RT_UNLIKELY(iEvent < 0))
     {
-        Log(("VBoxGuestCommonIOCtl: WAITEVENT: Invalid input mask %#x!!\n", fReqEvents));
+        LogRel(("VBoxGuestCommonIOCtl: WAITEVENT: Invalid input mask %#x!!\n", fReqEvents));
         return VERR_INVALID_PARAMETER;
     }
@@ -1715 +1740 @@
     if (cbReq < cbMinSize)
     {
-        Log(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid hdr size %#x, expected >= %#x; type=%#x!!\n",
+        LogRel(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid hdr size %#x, expected >= %#x; type=%#x!!\n",
              cbReq, cbMinSize, enmType));
         return VERR_INVALID_PARAMETER;
@@ -1721 +1746 @@
     if (cbReq > cbData)
     {
-        Log(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid size %#x, expected >= %#x (hdr); type=%#x!!\n",
+        LogRel(("VBoxGuestCommonIOCtl: VMMREQUEST: invalid size %#x, expected >= %#x (hdr); type=%#x!!\n",
              cbData, cbReq, enmType));
         return VERR_INVALID_PARAMETER;

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -50 +50 @@
 /** The max parameter buffer size for a kernel request. */
 #define VBGLR0_MAX_HGCM_KERNEL_PARM     (16*_1M)
-#if defined(RT_OS_LINUX) || (defined(RT_OS_DARWIN) && defined(RT_ARCH_X86))
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
 /** Linux needs to use bounce buffers since RTR0MemObjLockUser has unwanted
  * side effects.
- * Darwin 32bit also needs this because of 4GB/4GB user/kernel space. */
+ * Darwin 32bit & 64bit also needs this because of 4GB/4GB user/kernel space. */
 # define USE_BOUNCE_BUFFERS
 #endif