Changeset 85765 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 14, 2020 11:35:19 AM (5 years ago)

Author:

vboxsync

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

139916

Message:

VMM/HMVMXR0: Fix assertion with exception bitmaps by restoring debug state in the inner loop itself.

File:

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

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

@@ -12533 +12533 @@
         if (VBOXVMM_GET_SETTINGS_SEQ_NO() != DbgState.uDtraceSettingsSeqNo)
             hmR0VmxPreRunGuestDebugStateUpdate(pVCpu, &VmxTransient, &DbgState);
+
+        /* Restore all controls applied by hmR0VmxPreRunGuestDebugStateApply above. */
+        rcStrict = hmR0VmxRunDebugStateRevert(pVCpu, &VmxTransient, &DbgState, rcStrict);
+        Assert(rcStrict == VINF_SUCCESS);
     }
 
@@ -12548 +12552 @@
      *        flag is pending without being used. Seen early in bios init when
      *        accessing APIC page in protected mode. */
-
-    /*
-     * Restore VM-exit control settings as we may not re-enter this function the
-     * next time around.
-     */
-    rcStrict = hmR0VmxRunDebugStateRevert(pVCpu, &VmxTransient, &DbgState, rcStrict);
 
     /* Restore HMCPU indicators. */