Changeset 74787 in vbox for trunk

Timestamp:

Oct 12, 2018 10:24:40 AM (6 years ago)

Author:

vboxsync

Message:

vm.h,VMM: Made VM_FF_CLEAR work on a single flag too. bugref:9180

File:

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

trunk/include/VBox/vmm/vm.h

@@ -643 +643 @@
 
 /** @def VM_FF_CLEAR
- * Clears a force action flag.
+ * Clears a single force action flag.
  *
  * @param   pVM     The cross context VM structure.
@@ -649 +649 @@
  */
 #if 1
-# define VM_FF_CLEAR(pVM, fFlag)            ASMAtomicAndU32(&(pVM)->fGlobalForcedActions, ~(fFlag))
+# if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
+#  define VM_FF_CLEAR(pVM, fFlag)            ASMAtomicAndU32(&(pVM)->fGlobalForcedActions, ~(fFlag))
+# else
+#  define VM_FF_CLEAR(pVM, fFlag) \
+    ([](PVM a_pVM) -> void \
+    { \
+        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
+        ASMAtomicAndU32(&a_pVM->fGlobalForcedActions, ~(fFlag)); \
+    }(pVM))
+# endif
 #else
 # define VM_FF_CLEAR(pVM, fFlag) \
@@ -667 +676 @@
 #else
 # define VMCPU_FF_CLEAR(pVCpu, fFlag) \
-                   ([](PVMCPU a_pVCpu) -> void \
-                   { \
-                       AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
-                       ASMAtomicAndU32(&a_pVCpu->fLocalForcedActions, ~(fFlag)); \
-                   }(pVCpu))
+    ([](PVMCPU a_pVCpu) -> void \
+    { \
+        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
+        ASMAtomicAndU32(&a_pVCpu->fLocalForcedActions, ~(fFlag)); \
+    }(pVCpu))
 #endif
 
@@ -701 +710 @@
 #else
 # define VMCPU_FF_IS_SET(pVCpu, fFlag) \
-                   ([](PVMCPU a_pVCpu) -> bool \
-                   { \
-                       AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
-                       return (a_pVCpu->fLocalForcedActions & (fFlag)) == (fFlag); \
-                   }(pVCpu))
+    ([](PVMCPU a_pVCpu) -> bool \
+    { \
+        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
+        return (a_pVCpu->fLocalForcedActions & (fFlag)) == (fFlag); \
+    }(pVCpu))
 #endif