Changeset 86118 in vbox for trunk/include/VBox/vmm

Timestamp:

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

Author:

vboxsync

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

140352

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/include/VBox/vmm/vm.h (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -344 +344 @@
                   enmState, enmExpectedState, (pVCpu)->idCpu)); \
     } while (0)
+
+# define VMCPU_ASSERT_STATE_2(pVCpu, enmExpectedState, a_enmExpectedState2) \
+    do { \
+        VMCPUSTATE enmState = VMCPU_GET_STATE(pVCpu); \
+        AssertMsg(   enmState == (enmExpectedState) \
+                  || enmState == (a_enmExpectedState2), \
+                  ("enmState=%d  enmExpectedState=%d enmExpectedState2=%d idCpu=%u\n", \
+                  enmState, enmExpectedState, a_enmExpectedState2, (pVCpu)->idCpu)); \
+    } while (0)
 #else
 # define VMCPU_ASSERT_STATE(pVCpu, enmExpectedState) do { } while (0)
+# define VMCPU_ASSERT_STATE_2(pVCpu, enmExpectedState, a_enmExpectedState2) do { } while (0)
 #endif
 /** Tests if the state means that the CPU is started. */