Changeset 21197 in vbox

Timestamp:

Jul 3, 2009 1:20:24 PM (16 years ago)

Author:

vboxsync

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

49500

Message:

log-vbox.cpp: guest r0drv fixes.

File:

• trunk/src/VBox/Runtime/VBox/log-vbox.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -294 +294 @@
      */
 #ifdef IN_RING3
-# ifndef IN_GUEST_R3
+# ifndef IN_GUEST
     char szExecName[RTPATH_MAX];
     if (!RTProcGetExecutableName(szExecName, sizeof(szExecName)))
@@ -379 +379 @@
     }
 
-# else  /* IN_GUEST_R3  */
+# else  /* IN_GUEST */
     /* The user destination is backdoor logging. */
     rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG",
                      RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
                      RTLOGDEST_USER, "VBox.log");
-# endif /* IN_GUEST_R3 */
+# endif /* IN_GUEST */
 
 #else /* IN_RING0 */
-    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0],
-# ifdef LOG_TO_BACKDOOR  /** @todo look at guest ring 0 logging */
-                         RTLOGDEST_USER,
-# else
-                         RTLOGDEST_FILE,
-# endif
-                         "VBox-ring0.log");
+# ifndef IN_GUEST
+    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0], RTLOGDEST_FILE, "VBox-ring0.log");
+# else  /* IN_GUEST */
+    rc = RTLogCreate(&pLogger, 0, NULL, "VBOX_LOG", RT_ELEMENTS(g_apszGroups), &g_apszGroups[0], RTLOGDEST_USER, "VBox-ring0.log");
+# endif /* IN_GUEST */
     if (RT_SUCCESS(rc))
     {
@@ -404 +402 @@
          * that do differ (like Darwin), STDOUT is the kernel log.
          */
-# if 0 /*defined(DEBUG_bird) && !defined(IN_GUEST)*/
-        //RTLogGroupSettings(pLogger, "all=~0 -default.l6.l5.l4.l3");
-        RTLogGroupSettings(pLogger, "all=0 pgm*=~0 gmm=~0");
+# if defined(DEBUG_bird) && !defined(IN_GUEST)
+        RTLogGroupSettings(pLogger, "all=~0 -default.l6.l5.l4.l3");
         RTLogFlags(pLogger, "enabled unbuffered pid tid");
+#  ifndef IN_GUEST
         pLogger->fDestFlags |= RTLOGDEST_DEBUGGER | RTLOGDEST_STDOUT;
+#  endif
 # endif
 # if defined(DEBUG_sandervl) && !defined(IN_GUEST)