Changeset 69850 in vbox

Timestamp:

Nov 28, 2017 5:48:11 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Don't flag guest-CPU context changed while reverting debug state controls. Fixes assertion in hmR0VmxSaveGuestCR0.

File:

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

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

@@ -9529 +9529 @@
         AssertRCReturn(rc2, rc2);
         pVCpu->hm.s.vmx.u32ProcCtls = pDbgState->fProcCtlsInitial;
-        HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_CR0 | HM_CHANGED_GUEST_DEBUG);
     }
 
@@ -9545 +9544 @@
        reloading and partial recalculation the next time around. */
     if (pDbgState->fModifiedXcptBitmap)
-    {
         pVCpu->hm.s.vmx.u32XcptBitmap = pDbgState->bmXcptInitial;
-        HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_XCPT_INTERCEPTS | HM_CHANGED_GUEST_CR0);
-    }
-
-    /* We assume hmR0VmxLoadSharedCR0 will recalculate and load the CR0 mask. */
-    if (pDbgState->fClearCr0Mask)
-        HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_CR0);
-
-    /* We assume hmR0VmxLoadGuestCR3AndCR4 will recalculate and load the CR4 mask. */
-    if (pDbgState->fClearCr4Mask)
-        HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_CR4);
 
     return rcStrict;