儲存庫 vbox 的更動 48038

時間撮記:

2013-8-23 下午07:35:02 (11 年 以前)

作者:

vboxsync

訊息:

VMM/VMMR0, HMVMXR0: Minor fixes relating to error paths.

位置:

trunk/src/VBox/VMM/VMMR0

檔案:

• HMVMXR0.cpp (修改) (6 筆差異)
• VMMR0.cpp (修改) (3 筆差異)

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

@@ -6162 +6162 @@
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
 
-    /* Avoid repeating this work when thread-context hooks are used and we had been preempted before
-       which would've done this work from the VMXR0ThreadCtxCallback(). */
     RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
     bool fPreemptDisabled = false;
@@ -6173 +6171 @@
     }
 
+    /* Avoid repeating this work when thread-context hooks are used and we had been preempted before
+       which would've done this work from the VMXR0ThreadCtxCallback(). */
     if (!pVCpu->hm.s.fLeaveDone)
     {
@@ -6237 +6237 @@
     if (RT_UNLIKELY(rcExit == VERR_VMX_INVALID_GUEST_STATE))
     {
-        /* We want to see what the guest-state was before VM-entry, don't resync here, as we won't continue guest execution. */
+        /* We've done what is required in hmR0VmxExitErrInvalidGuestState(). We're not going to continue guest execution... */
         return;
     }
@@ -6245 +6245 @@
         pVCpu->hm.s.vmx.LastError.u32VMCSRevision = *(uint32_t *)pVCpu->hm.s.vmx.pvVmcs;
         pVCpu->hm.s.vmx.LastError.idEnteredCpu    = pVCpu->hm.s.idEnteredCpu;
-        pVCpu->hm.s.vmx.LastError.idCurrentCpu    = RTMpCpuId();
+        /* LastError.idCurrentCpu was updated in hmR0VmxPreRunGuestCommitted(). */
         return;
     }
@@ -9093 +9093 @@
     NOREF(uInvalidReason);
 
+#ifdef VBOX_STRICT
     Log4(("VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO    %#RX32\n", pVmxTransient->uEntryIntrInfo));
     Log4(("VMX_VMCS32_CTRL_ENTRY_EXCEPTION_ERRCODE    %#RX32\n", pVmxTransient->uEntryXcptErrorCode));
@@ -9110 +9111 @@
     rc = VMXReadVmcs64(VMX_VMCS64_CTRL_EPTP_FULL, &u64Val);                 AssertRC(rc);
     Log4(("VMX_VMCS64_CTRL_EPTP_FULL                  %#RX64\n", u64Val));
+#endif
 
     PVM pVM = pVCpu->CTX_SUFF(pVM);

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

@@ -568 +568 @@
 
         case RTTHREADCTXEVENT_PREEMPTING:
+        {
+            /* Invoke the HM-specific thread-context callback. */
+            HMR0ThreadCtxCallback(enmEvent, pvUser);
+
             /*
              * Sigh. See VMMGetCpu() used by VMCPU_ASSERT_EMT(). We cannot let several VCPUs
@@ -573 +577 @@
              */
             ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
-            /* fallthru, no break! */
+            break;
+        }
+
         default:
             /* Invoke the HM-specific thread-context callback. */
@@ -579 +585 @@
             break;
     }
-
 }