Changeset 20769 in vbox

Timestamp:

Jun 22, 2009 12:32:11 PM (15 years ago)

Author:

vboxsync

Message:

VMM: don't forget to enable R0 logging again if we are leaving VMXR0RunGuestCode() early

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (4 diffs)
• HWVMXR0.cpp (modified) (3 diffs)

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

@@ -1029 +1029 @@
     idCpuCheck = RTMpCpuId();
 #endif
-#ifdef LOG_ENABLED
     VMMR0LogFlushDisable(pVCpu);
-#endif
 
     /* Load the guest state; *must* be here as it sets up the shadow cr0 for lazy fpu syncing! */
     rc = SVMR0LoadGuestState(pVM, pVCpu, pCtx);
-    if (rc != VINF_SUCCESS)
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
     {
         STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatEntry, x);
+        VMMR0LogFlushEnable(pVCpu);
         goto end;
     }
@@ -1155 +1154 @@
     exitCode = pVMCB->ctrl.u64ExitCode;
 
-    if (exitCode == (uint64_t)SVM_EXIT_INVALID)          /* Invalid guest state. */
+    if (RT_UNLIKELY(exitCode == (uint64_t)SVM_EXIT_INVALID))      /* Invalid guest state. */
     {
         HWACCMDumpRegs(pVM, pVCpu, pCtx);
@@ -1276 +1275 @@
 #endif
         rc = VERR_SVM_UNABLE_TO_START_VM;
+        VMMR0LogFlushEnable(pVCpu);
         goto end;
     }
@@ -1326 +1326 @@
 
     /* Note! NOW IT'S SAFE FOR LOGGING! */
-#ifdef LOG_ENABLED
     VMMR0LogFlushEnable(pVCpu);
-#endif
 
     /* Take care of instruction fusing (sti, mov ss) (see 15.20.5 Interrupt Shadows) */

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

@@ -2274 +2274 @@
     /* Save the host state first. */
     rc  = VMXR0SaveHostState(pVM, pVCpu);
-    if (rc != VINF_SUCCESS)
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+    {
+        VMMR0LogFlushEnable(pVCpu);
         goto end;
+    }
     /* Load the guest state */
     rc = VMXR0LoadGuestState(pVM, pVCpu, pCtx);
-    if (rc != VINF_SUCCESS)
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+    {
+        VMMR0LogFlushEnable(pVCpu);
         goto end;
+    }
 
 #ifndef VBOX_WITH_VMMR0_DISABLE_PREEMPTION
@@ -2345 +2351 @@
     STAM_PROFILE_ADV_START(&pVCpu->hwaccm.s.StatExit1, v);
 
-    if (rc != VINF_SUCCESS)
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
     {
         VMXR0ReportWorldSwitchError(pVM, pVCpu, rc, pCtx);
+        VMMR0LogFlushEnable(pVCpu);
         goto end;
     }
@@ -2372 +2379 @@
 
     /* Note! NOW IT'S SAFE FOR LOGGING! */
-#ifdef LOG_ENABLED
     VMMR0LogFlushEnable(pVCpu);
-#endif
     Log2(("Raw exit reason %08x\n", exitReason));