Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 57885)
+++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 57886)
@@ -4629,5 +4629,5 @@
             rc |= hmR0VmxAddAutoLoadStoreMsr(pVCpu, MSR_K8_KERNEL_GS_BASE, pMixedCtx->msrKERNELGSBASE, false, NULL);
             AssertRCReturn(rc, rc);
-#ifdef DEBUG
+# ifdef LOG_ENABLED
             PVMXAUTOMSR pMsr = (PVMXAUTOMSR)pVCpu->hm.s.vmx.pvGuestMsr;
             for (uint32_t i = 0; i < pVCpu->hm.s.vmx.cMsrs; i++, pMsr++)
@@ -9117,5 +9117,5 @@
 
 
-#ifdef DEBUG
+#ifdef VBOX_STRICT
 /* Is there some generic IPRT define for this that are not in Runtime/internal/\* ?? */
 # define HMVMX_ASSERT_PREEMPT_CPUID_VAR() \
@@ -9123,36 +9123,35 @@
 
 # define HMVMX_ASSERT_PREEMPT_CPUID() \
-   do \
-   { \
-        RTCPUID const idAssertCpuNow = RTThreadPreemptIsEnabled(NIL_RTTHREAD) ? NIL_RTCPUID : RTMpCpuId(); \
-        AssertMsg(idAssertCpu == idAssertCpuNow,  ("VMX %#x, %#x\n", idAssertCpu, idAssertCpuNow)); \
-   } while (0)
+    do { \
+         RTCPUID const idAssertCpuNow = RTThreadPreemptIsEnabled(NIL_RTTHREAD) ? NIL_RTCPUID : RTMpCpuId(); \
+         AssertMsg(idAssertCpu == idAssertCpuNow,  ("VMX %#x, %#x\n", idAssertCpu, idAssertCpuNow)); \
+    } while (0)
 
 # define HMVMX_VALIDATE_EXIT_HANDLER_PARAMS() \
-            do { \
-                AssertPtr(pVCpu); \
-                AssertPtr(pMixedCtx); \
-                AssertPtr(pVmxTransient); \
-                Assert(pVmxTransient->fVMEntryFailed == false); \
-                Assert(ASMIntAreEnabled()); \
-                HMVMX_ASSERT_PREEMPT_SAFE(); \
-                HMVMX_ASSERT_PREEMPT_CPUID_VAR(); \
-                Log4Func(("vcpu[%RU32] -v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v\n", pVCpu->idCpu)); \
-                HMVMX_ASSERT_PREEMPT_SAFE(); \
-                if (VMMR0IsLogFlushDisabled(pVCpu)) \
-                    HMVMX_ASSERT_PREEMPT_CPUID(); \
-                HMVMX_STOP_EXIT_DISPATCH_PROF(); \
-            } while (0)
+    do { \
+        AssertPtr(pVCpu); \
+        AssertPtr(pMixedCtx); \
+        AssertPtr(pVmxTransient); \
+        Assert(pVmxTransient->fVMEntryFailed == false); \
+        Assert(ASMIntAreEnabled()); \
+        HMVMX_ASSERT_PREEMPT_SAFE(); \
+        HMVMX_ASSERT_PREEMPT_CPUID_VAR(); \
+        Log4Func(("vcpu[%RU32] -v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v-v\n", pVCpu->idCpu)); \
+        HMVMX_ASSERT_PREEMPT_SAFE(); \
+        if (VMMR0IsLogFlushDisabled(pVCpu)) \
+            HMVMX_ASSERT_PREEMPT_CPUID(); \
+        HMVMX_STOP_EXIT_DISPATCH_PROF(); \
+    } while (0)
 
 # define HMVMX_VALIDATE_EXIT_XCPT_HANDLER_PARAMS() \
-            do { \
-                Log4Func(("\n")); \
-            } while (0)
-#else   /* Release builds */
+    do { \
+        Log4Func(("\n")); \
+    } while (0)
+#else /* nonstrict builds: */
 # define HMVMX_VALIDATE_EXIT_HANDLER_PARAMS() \
-            do { \
-                HMVMX_STOP_EXIT_DISPATCH_PROF(); \
-                NOREF(pVCpu); NOREF(pMixedCtx); NOREF(pVmxTransient); \
-            } while (0)
+    do { \
+        HMVMX_STOP_EXIT_DISPATCH_PROF(); \
+        NOREF(pVCpu); NOREF(pMixedCtx); NOREF(pVmxTransient); \
+    } while (0)
 # define HMVMX_VALIDATE_EXIT_XCPT_HANDLER_PARAMS() do { } while (0)
 #endif
@@ -11100,5 +11099,5 @@
     }
 
-#ifdef DEBUG
+#ifdef VBOX_STRICT
     if (rcStrict == VINF_IOM_R3_IOPORT_READ)
         Assert(!fIOWrite);
@@ -11107,7 +11106,7 @@
     else
     {
-        /** @todo r=bird: This is missing a bunch of VINF_EM_FIRST..VINF_EM_LAST
-         *        statuses, that the VMM device and some others may return. See
-         *        IOM_SUCCESS() for guidance. */
+#if 0 /** @todo r=bird: This is missing a bunch of VINF_EM_FIRST..VINF_EM_LAST
+       *        statuses, that the VMM device and some others may return. See
+       *        IOM_SUCCESS() for guidance. */
         AssertMsg(   RT_FAILURE(rcStrict)
                   || rcStrict == VINF_SUCCESS
@@ -11117,4 +11116,5 @@
                   || rcStrict == VINF_EM_RAW_TO_R3
                   || rcStrict == VINF_TRPM_XCPT_DISPATCHED, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+#endif
     }
 #endif