Changeset 65697 in vbox

Timestamp:

Feb 9, 2017 12:24:35 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

113405

Message:

VMM/HMVMXR0: Set HM_CHANGED_ALL_GUEST after saving the guest state to avoid assertions that verify the guest-CPU state
isn't overwritten with stale info. from the VMCS.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

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

@@ -6876 +6876 @@
     if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fSupported)
     {
-        /* For now, imply that the caller might change everything too. */
+        int rc = hmR0VmxSaveGuestState(pVCpu, pMixedCtx);
+        /*
+         * For now, imply that the caller might change everything too. Do this after
+         * saving the guest state so as to not trigger assertions.
+         */
         HMCPU_CF_SET(pVCpu, HM_CHANGED_ALL_GUEST);
-        return hmR0VmxSaveGuestState(pVCpu, pMixedCtx);
+        return rc;
     }
     return VINF_SUCCESS;