Changeset 19702 in vbox for trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

Timestamp:

May 14, 2009 3:41:49 PM (16 years ago)

Author:

vboxsync

Message:

Need a separate ring 0 logger for each VCPU.

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -189 +189 @@
 
     /*
-     * Register the EMT R0 logger instance.
+     * Register the EMT R0 logger instance for VCPU 0.
      */
-    PVMMR0LOGGER pR0Logger = pVM->vmm.s.pR0LoggerR0;
+    PVMCPU pVCpu = &pVM->aCpus[0];
+
+    PVMMR0LOGGER pR0Logger = pVCpu->vmm.s.pR0LoggerR0;
     if (pR0Logger)
     {
@@ -759 +761 @@
 
         case VMMR0_DO_GVMM_REGISTER_VMCPU:
+        {
             if (!pVM)
                 return VERR_INVALID_PARAMETER;
+
+#ifdef LOG_ENABLED
+            /* Register the ring 0 logger for this thread here as well. */
+            PVMCPU       pVCpu = &pVM->aCpus[idCpu];
+            PVMMR0LOGGER pR0Logger = pVCpu->vmm.s.pR0LoggerR0;
+            if (pR0Logger)
+                RTLogSetDefaultInstanceThread(&pR0Logger->Logger, (uintptr_t)pVM->pSession);
+#endif
             return GVMMR0RegisterVCpu(pVM, idCpu);
+        }
 
         case VMMR0_DO_GVMM_SCHED_HALT:
@@ -1194 +1206 @@
 {
     PVM pVM = pVCpu->pVMR0;
-    if (pVM->vmm.s.pR0LoggerR0)
-        pVM->vmm.s.pR0LoggerR0->fFlushingDisabled = true;
+    if (pVCpu->vmm.s.pR0LoggerR0)
+        pVCpu->vmm.s.pR0LoggerR0->fFlushingDisabled = true;
 }
 
@@ -1207 +1219 @@
 {
     PVM pVM = pVCpu->pVMR0;
-    if (pVM->vmm.s.pR0LoggerR0)
-        pVM->vmm.s.pR0LoggerR0->fFlushingDisabled = false;
+    if (pVCpu->vmm.s.pR0LoggerR0)
+        pVCpu->vmm.s.pR0LoggerR0->fFlushingDisabled = false;
 }