Changeset 86118 in vbox for trunk/src/VBox/VMM/VMMR3/VMEmt.cpp

Timestamp:

Sep 14, 2020 9:09:05 AM (4 years ago)

Author:

vboxsync

Message:

VMM: Fix debug assertion for VMs with VMSVGA and 3D enabled and using NEM/Hyper-V where VMR3WaitHalted() might be called when the vmsvga sync register is accessed in R3 in the NEM execution loop

File:

• trunk/src/VBox/VMM/VMMR3/VMEmt.cpp (modified) (1 diff)

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

@@ -1152 +1152 @@
      * Do the halt.
      */
-    VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED);
+    VMCPU_ASSERT_STATE_2(pVCpu, VMCPUSTATE_STARTED, VMCPUSTATE_STARTED_EXEC_NEM);
+    VMCPUSTATE enmStateOld = VMCPU_GET_STATE(pVCpu);
     VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED_HALTED);
     PUVM pUVM = pUVCpu->pUVM;
     int rc = g_aHaltMethods[pUVM->vm.s.iHaltMethod].pfnHalt(pUVCpu, fMask, u64Now);
-    VMCPU_SET_STATE(pVCpu, VMCPUSTATE_STARTED);
+    VMCPU_SET_STATE(pVCpu, enmStateOld);
 
     /*