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

Timestamp:

Feb 28, 2014 4:53:46 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: First entry into VT-x may already have saved the host-context, skip that case for the assertion checking for guest mode changes..

File:

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

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

@@ -2105 +2105 @@
     Assert(!VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TLB_SHOOTDOWN));
 
-    /* Don't assert that VMCPU_FF_TLB_FLUSH should no longer pending. It can be set by other EMTs. */
+    /* Don't assert that VMCPU_FF_TLB_FLUSH should no longer be pending. It can be set by other EMTs. */
 }
 
@@ -4563 +4563 @@
         if (pVCpu->hm.s.vmx.pfnStartVM != VMXR0SwitcherStartVM64)
         {
+            if (pVCpu->hm.s.vmx.pfnStartVM != NULL) /* Very first entry would have saved host-state already, ignore it. */
+            {
+                /* Currently, all mode changes sends us back to ring-3, so these should be set. See @bugref{6944}. */
+                AssertMsg(HMCPU_CF_IS_SET(pVCpu, HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_EXIT_CTLS | HM_CHANGED_VMX_ENTRY_CTLS),
+                          ("flags=%#x\n", HMCPU_CF_VALUE(pVCpu)));
+            }
             pVCpu->hm.s.vmx.pfnStartVM = VMXR0SwitcherStartVM64;
-            /* Currently, all mode changes sends us back to ring-3, so these should be set. See @bugref{6944}. */
-            Assert(HMCPU_CF_IS_SET(pVCpu, HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_EXIT_CTLS | HM_CHANGED_VMX_ENTRY_CTLS));
         }
 #else
@@ -4578 +4582 @@
         if (pVCpu->hm.s.vmx.pfnStartVM != VMXR0StartVM32)
         {
+            if (pVCpu->hm.s.vmx.pfnStartVM != NULL) /* Very first entry would have saved host-state already, ignore it. */
+            {
+                /* Currently, all mode changes sends us back to ring-3, so these should be set. See @bugref{6944}. */
+                AssertMsg(HMCPU_CF_IS_SET(pVCpu, HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_EXIT_CTLS | HM_CHANGED_VMX_ENTRY_CTLS),
+                          ("flags=%#x\n", HMCPU_CF_VALUE(pVCpu)));
+            }
             pVCpu->hm.s.vmx.pfnStartVM = VMXR0StartVM32;
-            /* Currently, all mode changes sends us back to ring-3, so these should be set. See @bugref{6944}. */
-            Assert(HMCPU_CF_IS_SET(pVCpu, HM_CHANGED_HOST_CONTEXT | HM_CHANGED_VMX_EXIT_CTLS | HM_CHANGED_VMX_ENTRY_CTLS));
         }
 #else