Changeset 26123 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 1, 2010 2:27:03 PM (15 years ago)

Author:

vboxsync

Message:

Solaris/Additions/vboxguest: make LogRel working again.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -196 +196 @@
         LogRel((DEVICE_NAME ":failed to disable autounloading!\n"));
 
-    int rc = ddi_soft_state_init(&g_pVBoxGuestSolarisState, sizeof(vboxguest_state_t), 1);
+    PRTLOGGER pRelLogger;
+    static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
+    int 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);
+
+    rc = ddi_soft_state_init(&g_pVBoxGuestSolarisState, sizeof(vboxguest_state_t), 1);
     if (!rc)
     {
@@ -213 +221 @@
     if (!rc)
         ddi_soft_state_fini(&g_pVBoxGuestSolarisState);
+
+    RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
+    RTLogDestroy(RTLogSetDefaultInstance(NULL));
+
     return rc;
 }
@@ -567 +579 @@
     if (!pState)
     {
-        Log((DEVICE_NAME "::IOCtl: no state data for %d\n", getminor(Dev)));
+        LogRel((DEVICE_NAME "::IOCtl: no state data for %d\n", getminor(Dev)));
         return EINVAL;
     }
@@ -574 +586 @@
     if (!pSession)
     {
-        Log((DEVICE_NAME "::IOCtl: no session data for %d\n", getminor(Dev)));
+        LogRel((DEVICE_NAME "::IOCtl: no session data for %d\n", getminor(Dev)));
         return EINVAL;
     }
@@ -603 +615 @@
                     || ReqWrap.cbData > _1M*16))
     {
-        Log((DEVICE_NAME "::IOCtl: bad size %#x; pArg=%p Cmd=%d.\n", ReqWrap.cbData, pArg, Cmd));
+        LogRel((DEVICE_NAME "::IOCtl: bad size %#x; pArg=%p Cmd=%d.\n", ReqWrap.cbData, pArg, Cmd));
         return EINVAL;
     }