Changeset 108366 in vbox

Timestamp:

Feb 25, 2025 10:35:57 AM (8 weeks ago)

Author:

vboxsync

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

167727

Message:

VMM/NEMR3Native-win-armv8.cpp: Fix todo, don't import the whole VM state when handling a VM exit except for when state logging is enabled, bugref:10392

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp

@@ -1879 +1879 @@
 DECLINLINE(void) nemR3WinCopyStateFromArmHeader(PVMCPUCC pVCpu, WHV_INTERCEPT_MESSAGE_HEADER const *pMsgHdr)
 {
-    Assert(   (pVCpu->cpum.GstCtx.fExtrn & (CPUMCTX_EXTRN_PC | CPUMCTX_EXTRN_PSTATE))
-           ==                              (CPUMCTX_EXTRN_PC | CPUMCTX_EXTRN_PSTATE));
+#ifdef LOG_ENABLED /* When state logging is enabled the state is synced completely upon VM exit. */
+    if (!LogIs3Enabled())
+#endif
+        Assert(   (pVCpu->cpum.GstCtx.fExtrn & (CPUMCTX_EXTRN_PC | CPUMCTX_EXTRN_PSTATE))
+               ==                              (CPUMCTX_EXTRN_PC | CPUMCTX_EXTRN_PSTATE));
 
     pVCpu->cpum.GstCtx.Pc.u64   = pMsgHdr->Pc;
@@ -2158 +2161 @@
                                             : EMEXIT_MAKE_FT(EMEXIT_F_KIND_EM, EMEXITTYPE_MMIO_READ),
                                             pHdr->Pc, uHostTsc);
-#pragma message("nemR3WinHandleExitMemory: Why not calling nemR3WinCopyStateFromArmHeader?")
-/** @todo r=bird: Why is nemR3WinCopyStateFromArmHeader commented out? */
-    //nemR3WinCopyStateFromArmHeader(pVCpu, &pExit->MemoryAccess.Header);
+    nemR3WinCopyStateFromArmHeader(pVCpu, &pExit->MemoryAccess.Header);
     RT_NOREF_PV(pExitRec);
     rc = nemHCWinCopyStateFromHyperV(pVM, pVCpu, IEM_CPUMCTX_EXTRN_MUST_MASK);
@@ -2439 +2440 @@
 NEM_TMPL_STATIC VBOXSTRICTRC nemR3WinHandleExit(PVMCC pVM, PVMCPUCC pVCpu, MY_WHV_RUN_VP_EXIT_CONTEXT const *pExit)
 {
-    int rc = nemHCWinCopyStateFromHyperV(pVM, pVCpu, CPUMCTX_EXTRN_ALL);
-    AssertRCReturn(rc, rc);
-
 #ifdef LOG_ENABLED
     if (LogIs3Enabled())
+    {
+        int rc = nemHCWinCopyStateFromHyperV(pVM, pVCpu, CPUMCTX_EXTRN_ALL);
+        AssertRCReturn(rc, rc);
+
         nemR3WinLogState(pVM, pVCpu);
+    }
 #endif