Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 49888)
+++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 49889)
@@ -6583,6 +6583,4 @@
  * @param   fSaveGuestState     Whether to save the guest state or not.
  *
- * @remarks If you modify code here, make sure to check whether
- *          hmR0VmxCallRing3Callback() needs to be updated too!!!
  * @remarks No-long-jmp zone!!!
  */
@@ -6594,4 +6592,9 @@
     RTCPUID idCpu = RTMpCpuId();
     Log4Func(("HostCpuId=%u\n", idCpu));
+
+    /*
+     * IMPORTANT!!!
+     * If you modify code here, make sure to check whether hmR0SvmCallRing3Callback() needs to be updated too.
+     */
 
     /* Save the guest state if necessary. */
@@ -6714,4 +6717,9 @@
         pVCpu->hm.s.fLeaveDone = true;
     }
+
+    /*
+     * IMPORTANT!!!
+     * If you modify code here, make sure to check whether hmR0SvmCallRing3Callback() needs to be updated too.
+     */
 
     /* Deregister hook now that we've left HM context before re-enabling preemption. */
@@ -6837,7 +6845,4 @@
  *                          may be out-of-sync. Make sure to update the required
  *                          fields before using them.
- *
- * @remarks If you modify code here, make sure to check whether
- *          hmR0VmxLeave() needs to be updated too!!!
  */
 DECLCALLBACK(int) hmR0VmxCallRing3Callback(PVMCPU pVCpu, VMMCALLRING3 enmOperation, void *pvUser)
@@ -6845,5 +6850,9 @@
     if (enmOperation == VMMCALLRING3_VM_R0_ASSERTION)
     {
-        /* If anything here asserts or fails, good luck. */
+        /*
+         * !!! IMPORTANT !!!
+         * If you modify code here, make sure to check whether hmR0VmxLeave() and hmR0VmxLeaveSession() needs
+         * to be updated too. This is a stripped down version which gets out ASAP trying to not trigger any assertion.
+         */
         VMMRZCallRing3RemoveNotification(pVCpu);
         VMMRZCallRing3Disable(pVCpu);