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

Timestamp:

Feb 14, 2022 1:13:54 PM (3 years ago)

Author:

vboxsync

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

149894

Message:

VMM/NEMR3Native-darwin: Fix clearing context changed flag for TSC AUX which caused an debug assertion, bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp

@@ -1734 +1734 @@
         ASMAtomicUoAndU64(&pVCpu->nem.s.fCtxChanged, ~HM_CHANGED_GUEST_SYSCALL_MSRS);
     }
+    if (fWhat & CPUMCTX_EXTRN_TSC_AUX)
+    {
+        PCPUMCTXMSRS pCtxMsrs = CPUMQueryGuestCtxMsrsPtr(pVCpu);
+
+        WRITE_MSR(MSR_K8_TSC_AUX, pCtxMsrs->msr.TscAux);
+        ASMAtomicUoAndU64(&pVCpu->nem.s.fCtxChanged, ~HM_CHANGED_GUEST_TSC_AUX);
+    }
     if (fWhat & CPUMCTX_EXTRN_OTHER_MSRS)
     {
-        PCPUMCTXMSRS pCtxMsrs = CPUMQueryGuestCtxMsrsPtr(pVCpu);
-
-        WRITE_MSR(MSR_K8_TSC_AUX, pCtxMsrs->msr.TscAux);
-        ASMAtomicUoAndU64(&pVCpu->nem.s.fCtxChanged, ~HM_CHANGED_GUEST_OTHER_MSRS);
-
         /* Last Branch Record. */
         if (pVM->nem.s.fLbr)
@@ -1760 +1762 @@
             WRITE_MSR(pVM->nem.s.idLbrTosMsr, pVmcsInfoShared->u64LbrTosMsr);
         }
+
+        ASMAtomicUoAndU64(&pVCpu->nem.s.fCtxChanged, ~HM_CHANGED_GUEST_OTHER_MSRS);
     }