Changeset 7924 in vbox for trunk/src/VBox

Timestamp:

Apr 11, 2008 3:47:21 PM (17 years ago)

Author:

vboxsync

Message:

Fixed broken ring 0 log flushing

Location:

trunk/src/VBox/VMM

Files:

• VMM.cpp (modified) (3 diffs)
• VMMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMM.cpp

@@ -436 +436 @@
                     if (VBOX_SUCCESS(rc))
                     {
-                        pVM->vmm.s.pR0Logger->pVM = pVM;
+                        pVM->vmm.s.pR0Logger->pVM = pVM->pVMR0;
                         //pVM->vmm.s.pR0Logger->fCreated = false;
                         pVM->vmm.s.pR0Logger->cbLogger = RT_OFFSETOF(RTLOGGER, afGroups[pLogger->cGroups]);
@@ -1997 +1997 @@
         if (    pR0Logger
             &&  pR0Logger->Logger.offScratch > 0)
+{
+            RTLogWriteStdOut(pR0Logger->Logger.achScratch, pR0Logger->Logger.offScratch);
             RTLogFlushToLogger(&pR0Logger->Logger, NULL);
+}
 #endif /* !LOG_ENABLED */
         if (rc != VINF_VMM_CALL_HOST)
@@ -2076 +2079 @@
 #ifdef LOG_ENABLED
         PRTLOGGERGC pLogger = pVM->vmm.s.pLoggerHC;
+if (rc == VINF_VMM_CALL_HOST && pVM->vmm.s.u64CallHostArg == 12345) _asm int 3;
+
         if (    pLogger
             &&  pLogger->offScratch > 0)

trunk/src/VBox/VMM/VMMInternal.h

@@ -76 +76 @@
 {
     /** Pointer to the VM handle. */
-    PVM                         pVM;
+    R0PTRTYPE(PVM)              pVM;
     /** Size of the allocated logger instance (Logger). */
     uint32_t                    cbLogger;