Index: /trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp	(revision 19828)
+++ /trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp	(revision 19829)
@@ -974,7 +974,9 @@
      *       (until the actual world switch)
      */
-
 #ifdef VBOX_STRICT
     idCpuCheck = RTMpCpuId();
+#endif
+#ifdef LOG_LOGGING
+    VMMR0LogFlushDisable(pVCpu);
 #endif
 
@@ -1267,4 +1269,7 @@
 
     /* Note! NOW IT'S SAFE FOR LOGGING! */
+#ifdef LOG_LOGGING
+    VMMR0LogFlushEnable(pVCpu);
+#endif
 
     /* Take care of instruction fusing (sti, mov ss) (see 15.20.5 Interrupt Shadows) */
Index: /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp	(revision 19828)
+++ /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp	(revision 19829)
@@ -1796,5 +1796,7 @@
 {
     NOREF(pVM);
-    NOREF(pVCpu);
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_FLUSH);
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_TLB_SHOOTDOWN);
+    pVCpu->hwaccm.s.cTlbShootdownPages = 0;
     return;
 }