Index: /trunk/include/VBox/vmm/vm.h
===================================================================
--- /trunk/include/VBox/vmm/vm.h	(revision 74792)
+++ /trunk/include/VBox/vmm/vm.h	(revision 74793)
@@ -625,21 +625,6 @@
  * @param   fFlag   The flag to set.
  */
-#if 1
-# if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
-#  define VM_FF_SET(pVM, fFlag)              ASMAtomicOrU32(&(pVM)->fGlobalForcedActions, (fFlag))
-# else
-#  define VM_FF_SET(pVM, fFlag) \
-    ([](PVM a_pVM) -> void \
-    { \
-        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
-        ASMAtomicOrU32(&a_pVM->fGlobalForcedActions, (fFlag)); \
-    }(pVM))
-# endif
-#else
-# define VM_FF_SET(pVM, fFlag) \
-    do { ASMAtomicOrU32(&(pVM)->fGlobalForcedActions, (fFlag)); \
-         RTLogPrintf("VM_FF_SET  : %08x %s - %s(%d) %s\n", (pVM)->fGlobalForcedActions, #fFlag, __FILE__, __LINE__, __FUNCTION__); \
-    } while (0)
-#endif
+#define VM_FF_SET(pVM, fFlag) \
+    do { AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); ASMAtomicOrU32(&(pVM)->fGlobalForcedActions, (fFlag)); } while (0)
 
 /** @def VMCPU_FF_SET
@@ -650,14 +635,6 @@
  * @sa      VMCPU_FF_SET_MASK
  */
-#if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
-# define VMCPU_FF_SET(pVCpu, fFlag)          ASMAtomicOrU32(&(pVCpu)->fLocalForcedActions, (fFlag))
-#else
-# define VMCPU_FF_SET(pVCpu, fFlag) \
-    ([](PVMCPU a_pVCpu) -> void \
-    { \
-        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
-        ASMAtomicOrU32(&a_pVCpu->fLocalForcedActions, (fFlag)); \
-    }(pVCpu))
-#endif
+#define VMCPU_FF_SET(pVCpu, fFlag) \
+    do { AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); ASMAtomicOrU32(&(pVCpu)->fLocalForcedActions, (fFlag)); } while (0)
 
 /** @def VMCPU_FF_SET
@@ -668,5 +645,6 @@
  * @sa      VMCPU_FF_SET
  */
-#define VMCPU_FF_SET_MASK(a_pVCpu, fFlags)  ASMAtomicOrU32(&a_pVCpu->fLocalForcedActions, (fFlags))
+#define VMCPU_FF_SET_MASK(a_pVCpu, fFlags) \
+    do { ASMAtomicOrU32(&a_pVCpu->fLocalForcedActions, (fFlags)); } while (0)
 
 /** @def VM_FF_CLEAR
@@ -676,21 +654,6 @@
  * @param   fFlag   The flag to clear.
  */
-#if 1
-# 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) \
-    do { ASMAtomicAndU32(&(pVM)->fGlobalForcedActions, ~(fFlag)); \
-         RTLogPrintf("VM_FF_CLEAR: %08x %s - %s(%d) %s\n", (pVM)->fGlobalForcedActions, #fFlag, __FILE__, __LINE__, __FUNCTION__); \
-    } while (0)
-#endif
+#define VM_FF_CLEAR(pVM, fFlag) \
+    do { AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); ASMAtomicAndU32(&(pVM)->fGlobalForcedActions, ~(fFlag)); } while (0)
 
 /** @def VMCPU_FF_CLEAR
@@ -700,14 +663,6 @@
  * @param   fFlag   The flag to clear.
  */
-#if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
-# define VMCPU_FF_CLEAR(pVCpu, fFlag)       ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlag))
-#else
-# define VMCPU_FF_CLEAR(pVCpu, fFlag) \
-    ([](PVMCPU a_pVCpu) -> void \
-    { \
-        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
-        ASMAtomicAndU32(&a_pVCpu->fLocalForcedActions, ~(fFlag)); \
-    }(pVCpu))
-#endif
+#define VMCPU_FF_CLEAR(pVCpu, fFlag) \
+    do { AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlag)); } while (0)
 
 /** @def VMCPU_FF_CLEAR_MASK
@@ -717,5 +672,6 @@
  * @param   fFlags  The flags to clear.
  */
-#define VMCPU_FF_CLEAR_MASK(pVCpu, fFlags)  ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlags))
+#define VMCPU_FF_CLEAR_MASK(pVCpu, fFlags) \
+    do { ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlags)); } while (0)
 
 /** @def VM_FF_IS_SET