Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 64774)
+++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 64775)
@@ -3110,5 +3110,5 @@
 
 /**
- * Saves certain host MSRs in the VM-Exit MSR-load area and some in the
+ * Saves certain host MSRs in the VM-exit MSR-load area and some in the
  * host-state area of the VMCS. Theses MSRs will be automatically restored on
  * the host after every successful VM-exit.
@@ -9085,4 +9085,8 @@
  */
 
+/**
+ * Transient per-VCPU debug state of VMCS and related info. we save/restore in
+ * the debug run loop.
+ */
 typedef struct VMXRUNDBGSTATE
 {
@@ -9114,5 +9118,5 @@
      *  configured against. */
     uint32_t    uDtraceSettingsSeqNo;
-    /** Exits to check (one bit per exit). */
+    /** VM-exits to check (one bit per VM-exit). */
     uint32_t    bmExitsToCheck[3];
 
@@ -9221,5 +9225,5 @@
 {
     /*
-     * Restore exit control settings as we may not reenter this function the
+     * Restore VM-exit control settings as we may not reenter this function the
      * next time around.
      */
@@ -9270,5 +9274,5 @@
  *
  * This updates @a pDbgState and the VMCS execution control fields to reflect
- * the necessary exits demanded by DBGF and DTrace.
+ * the necessary VM-exits demanded by DBGF and DTrace.
  *
  * @param   pVM             The cross context VM structure.
@@ -9344,5 +9348,5 @@
 
     /*
-     * Process events and probes for VM exits, making sure we get the wanted exits.
+     * Process events and probes for VM-exits, making sure we get the wanted VM-exits.
      *
      * Note! This is the reverse of waft hmR0VmxHandleExitDtraceEvents does.
@@ -9561,9 +9565,10 @@
 
 /**
- * Fires off DBGF events and dtrace probes for an exit, when it's appropriate.
- *
- * The caller has checked exit against the VMXRUNDBGSTATE::bmExitsToCheck
- * bitmap. The caller has checked for NMIs already, so we don't have to do that
- * either.
+ * Fires off DBGF events and dtrace probes for a VM-exit, when it's
+ * appropriate.
+ *
+ * The caller has checked the VM-exit against the
+ * VMXRUNDBGSTATE::bmExitsToCheck bitmap. The caller has checked for NMIs
+ * already, so we don't have to do that either.
  *
  * @returns Strict VBox status code (i.e. informational status codes too).
@@ -9772,5 +9777,5 @@
 
         default:
-            AssertMsgFailed(("Unexpected exit=%#x\n", uExitReason));
+            AssertMsgFailed(("Unexpected VM-exit=%#x\n", uExitReason));
             break;
     }
@@ -9950,7 +9955,7 @@
  * Single-stepping VM-exit filtering.
  *
- * This is preprocessing the exits and deciding whether we've gotten far enough
- * to return VINF_EM_DBG_STEPPED already.  If not, normal VM-exit handling is
- * performed.
+ * This is preprocessing the VM-exits and deciding whether we've gotten far
+ * enough to return VINF_EM_DBG_STEPPED already.  If not, normal VM-exit
+ * handling is performed.
  *
  * @returns Strict VBox status code (i.e. informational status codes too).
@@ -9968,5 +9973,5 @@
 {
     /*
-     * Expensive (saves context) generic dtrace exit probe.
+     * Expensive (saves context) generic dtrace VM-exit probe.
      */
     if (!VBOXVMM_R0_HMVMX_VMEXIT_ENABLED())
@@ -10078,5 +10083,5 @@
 
             default:
-                AssertMsgFailed(("Unexpected exit=%#x\n", uExitReason));
+                AssertMsgFailed(("Unexpected VM-exit=%#x\n", uExitReason));
                 break;
         }
@@ -10513,5 +10518,5 @@
             return hmR0VmxExitSetPendingXcptUD(pVCpu, pMixedCtx, pVmxTransient);
         case VMX_EXIT_RESERVED_60:
-        case VMX_EXIT_RDSEED: /* only spurious exits, so undefined */
+        case VMX_EXIT_RDSEED: /* only spurious VM-exits, so undefined */
         case VMX_EXIT_RESERVED_62:
         default:
@@ -13170,5 +13175,5 @@
     HM_DISABLE_PREEMPT();
 
-    /* If the guest FPU was active at the time of the #NM exit, then it's a guest fault. */
+    /* If the guest FPU was active at the time of the #NM VM-exit, then it's a guest fault. */
     if (pVmxTransient->fWasGuestFPUStateActive)
     {