Changeset 87347 in vbox

Timestamp:

Jan 21, 2021 11:55:06 AM (4 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Recalc DRx after loading state. Ignore saved use flags.

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -2959 +2959 @@
              * Restore a couple of flags and the MSRs.
              */
-            SSMR3GetU32(pSSM, &pVCpu->cpum.s.fUseFlags);
+            uint32_t fIgnoredUsedFlags = 0;
+            rc = SSMR3GetU32(pSSM, &fIgnoredUsedFlags); /* we're recalc the two relevant flags after loading state. */
+            AssertRCReturn(rc, rc);
             SSMR3GetU32(pSSM, &pVCpu->cpum.s.fChanged);
 
@@ -3115 +3117 @@
         if (fSupportsLongMode)
             pVCpu->cpum.s.fUseFlags |= CPUM_USE_SUPPORTS_LONGMODE;
+
+        /* Recalc the CPUM_USE_DEBUG_REGS_HYPER value. */
+        CPUMRecalcHyperDRx(pVCpu, UINT8_MAX);
     }
     return VINF_SUCCESS;