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

Timestamp:

Sep 25, 2017 12:38:46 PM (7 years ago)

Author:

vboxsync

Message:

vm.h: Renamed the VM_IS_RUNNING macro to something indicating that it obviously only suitable for assertions. (variable is volatile, we don't read stuff three times in release builds since we may get three different values.)

File:

• trunk/include/VBox/vmm/vm.h (modified) (2 diffs)

trunk/include/VBox/vmm/vm.h

@@ -825 +825 @@
 # define VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu) \
     Assert(    VMCPU_IS_EMT(pVCpu) \
-           || !VM_IS_RUNNING((pVCpu)->CTX_SUFF(pVM)) )
+           || !VM_IS_RUNNING_FOR_ASSERTIONS_ONLY((pVCpu)->CTX_SUFF(pVM)) )
 #else
 # define VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu) \
     AssertMsg(    VMCPU_IS_EMT(pVCpu) \
-              || !VM_IS_RUNNING((pVCpu)->CTX_SUFF(pVM)), \
+              || !VM_IS_RUNNING_FOR_ASSERTIONS_ONLY((pVCpu)->CTX_SUFF(pVM)), \
               ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd idCpu=%#x\n", \
                RTThreadNativeSelf(), (pVCpu)->hNativeThread, (pVCpu)->idCpu))
 #endif
 
-/** @def VM_IS_RUNNING
+/** @def VM_IS_RUNNING_FOR_ASSERTIONS_ONLY
  * Checks if the the VM is running.
- */
-#define VM_IS_RUNNING(pVM)                  (   (pVM)->enmVMState == VMSTATE_RUNNING    \
-                                             || (pVM)->enmVMState == VMSTATE_RUNNING_LS \
-                                             || (pVM)->enmVMState == VMSTATE_RUNNING_FT)
+ * @note Thie is only for pure debug assertions.  No AssertReturn or similar!
+ */
+#define VM_IS_RUNNING_FOR_ASSERTIONS_ONLY(pVM) \
+    (   (pVM)->enmVMState == VMSTATE_RUNNING \
+     || (pVM)->enmVMState == VMSTATE_RUNNING_LS \
+     || (pVM)->enmVMState == VMSTATE_RUNNING_FT )
 
 /** @def VM_ASSERT_IS_NOT_RUNNING
@@ -845 +847 @@
  */
 #if defined(IN_RC) || defined(IN_RING0)
-#define VM_ASSERT_IS_NOT_RUNNING(pVM)       Assert(!VM_IS_RUNNING(pVM))
-#else
-#define VM_ASSERT_IS_NOT_RUNNING(pVM)       AssertMsg(!VM_IS_RUNNING(pVM), ("VM is running. enmVMState=%d\n", \
-                                                      (pVM)->enmVMState))
+#define VM_ASSERT_IS_NOT_RUNNING(pVM)       Assert(!VM_IS_RUNNING_FOR_ASSERTIONS_ONLY(pVM))
+#else
+#define VM_ASSERT_IS_NOT_RUNNING(pVM)       AssertMsg(!VM_IS_RUNNING_FOR_ASSERTIONS_ONLY(pVM), \
+                                                      ("VM is running. enmVMState=%d\n", (pVM)->enmVMState))
 #endif