Changeset 54384 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 23, 2015 3:03:09 PM (10 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Fix debug assertion on 32-bit hosts. Host-state is already saved in HMR0Enter() while entering from ring-3/longjmp.

File:

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

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

@@ -4850 +4850 @@
             {
                 /* 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
+                AssertMsg(HMCPU_CF_IS_SET(pVCpu,   HM_CHANGED_VMX_EXIT_CTLS
                                                  | HM_CHANGED_VMX_ENTRY_CTLS
                                                  | HM_CHANGED_GUEST_EFER_MSR), ("flags=%#x\n", HMCPU_CF_VALUE(pVCpu)));
@@ -4871 +4870 @@
             {
                 /* 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
+                AssertMsg(HMCPU_CF_IS_SET(pVCpu,   HM_CHANGED_VMX_EXIT_CTLS
                                                  | HM_CHANGED_VMX_ENTRY_CTLS
                                                  | HM_CHANGED_GUEST_EFER_MSR), ("flags=%#x\n", HMCPU_CF_VALUE(pVCpu)));
@@ -8595 +8593 @@
      * thread-context hooks are used or when hmR0VmxSetupVMRunHandler() changes pfnStartVM).
      */
+    /** @todo Why should hmR0VmxSetupVMRunHandler() changing pfnStartVM have
+     *        any effect to the host state needing to be saved? */
     if (HMCPU_CF_IS_PENDING(pVCpu, HM_CHANGED_HOST_CONTEXT))
     {