Index: /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp	(revision 41803)
@@ -2119,5 +2119,5 @@
  *
  * @returns true if in real mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestNXEnabled(PVMCPU pVCpu)
@@ -2131,5 +2131,5 @@
  *
  * @returns true if in real mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestPageSizeExtEnabled(PVMCPU pVCpu)
@@ -2144,5 +2144,5 @@
  *
  * @returns true if in real mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestPagingEnabled(PVMCPU pVCpu)
@@ -2156,5 +2156,5 @@
  *
  * @returns true if in real mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestR0WriteProtEnabled(PVMCPU pVCpu)
@@ -2168,5 +2168,5 @@
  *
  * @returns true if in real mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestInRealMode(PVMCPU pVCpu)
@@ -2180,5 +2180,5 @@
  *
  * @returns @c true if it is, @c false if not.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestInRealOrV86Mode(PVMCPU pVCpu)
@@ -2193,5 +2193,5 @@
  *
  * @returns true if in protected mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestInProtectedMode(PVMCPU pVCpu)
@@ -2205,5 +2205,5 @@
  *
  * @returns true if in paged protected mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestInPagedProtectedMode(PVMCPU pVCpu)
@@ -2217,5 +2217,5 @@
  *
  * @returns true if in long mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestInLongMode(PVMCPU pVCpu)
@@ -2229,5 +2229,5 @@
  *
  * @returns true if in PAE mode, otherwise false.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) CPUMIsGuestInPAEMode(PVMCPU pVCpu)
@@ -2335,5 +2335,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu       VMCPU handle
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(int) CPUMHandleLazyFPU(PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMAll/DBGFAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/DBGFAll.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMAll/DBGFAll.cpp	(revision 41803)
@@ -119,5 +119,5 @@
  * @returns stepping (true) or not (false).
  *
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) DBGFIsStepping(PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMAll/IEMAll.cpp	(revision 41803)
@@ -2806,5 +2806,5 @@
  *
  * @returns true if it is, false if it's in FNSAVE.
- * @param   pVCpu               The virtual CPU handle.
+ * @param   pVCpu               Pointer to the VMCPU.
  */
 DECLINLINE(bool) iemFRegIsFxSaveFormat(PIEMCPU pIemCpu)
Index: /trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp	(revision 41803)
@@ -693,5 +693,5 @@
  * @returns false if not owner.
  * @param   pCritSect   The critical section.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  */
 VMMDECL(bool) PDMCritSectIsOwnerEx(PCPDMCRITSECT pCritSect, PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp	(revision 41803)
@@ -1991,5 +1991,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu       The VMCPU Handle
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   GCPtr       The guest pointer to convert.
  * @param   pGCPhys     Where to store the GC physical address.
@@ -2010,5 +2010,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu       The VMCPU Handle
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   GCPtr       The guest pointer to convert.
  * @param   pHCPhys     Where to store the HC physical address.
Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp	(revision 41803)
@@ -167,5 +167,5 @@
  * for mapping conflicts and set the SyncCR3 FF if found.
  *
- * @param   pVCpu       VMCPU handle
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   pPool       The pool.
  * @param   pPage       The head page.
Index: /trunk/src/VBox/VMM/VMMAll/REMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/REMAll.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMAll/REMAll.cpp	(revision 41803)
@@ -206,5 +206,5 @@
  *
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle of the calling EMT.
+ * @param   pVCpu       Pointer to the VMCPU of the calling EMT.
  */
 VMMDECL(void) REMNotifyHandlerPhysicalFlushIfAlmostFull(PVM pVM, PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMAll/SELMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/SELMAll.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMAll/SELMAll.cpp	(revision 41803)
@@ -140,5 +140,5 @@
  *
  * @returns VBox status
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   SelReg      Selector register.
  * @param   pCtxCore    CPU context.
@@ -448,5 +448,5 @@
  *
  * @returns VBox status
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   eflags      Current eflags
  * @param   Sel         Selector part.
@@ -664,5 +664,5 @@
  *
  * @returns VINF_SUCCESS.
- * @param   pVCpu   The Virtual CPU handle.
+ * @param   pVCpu   Pointer to the VMCPU.
  * @param   SelCS   Selector part.
  * @param   pHidCS  The hidden CS register part. Optional.
@@ -690,5 +690,5 @@
  * @returns VBox status code.
  * @param   pVM     Pointer to the VM.
- * @param   pVCpu   The virtual CPU handle.
+ * @param   pVCpu   Pointer to the VMCPU.
  * @param   SelCPL  Current privilege level. Get this from SS - CS might be conforming!
  *                  A full selector can be passed, we'll only use the RPL part.
@@ -833,5 +833,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   eflags      Current eflags
  * @param   SelCPL      Current privilege level. Get this from SS - CS might be
@@ -861,5 +861,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu        Pointer to the VMCPU.
  * @param   eflags       Current eflags
  * @param   SelCPL       Current privilege level. Get this from SS - CS might be conforming!
@@ -894,5 +894,5 @@
  * @returns DISCPUMODE according to the selector type (16, 32 or 64 bits)
  * @param   pVM     Pointer to the VM.
- * @param   pVCpu   The virtual CPU handle.
+ * @param   pVCpu   Pointer to the VMCPU.
  * @param   Sel     The selector.
  */
@@ -920,5 +920,5 @@
  *
  * @returns DISCPUMODE according to the selector type (16, 32 or 64 bits)
- * @param   pVCpu      The virtual CPU handle.
+ * @param   pVCpu      Pointer to the VMCPU.
  * @param   eflags     Current eflags register
  * @param   Sel        The selector.
Index: /trunk/src/VBox/VMM/VMMR3/CPUM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/CPUM.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/CPUM.cpp	(revision 41803)
@@ -1061,5 +1061,5 @@
  * Used by CPUMR3Reset and CPU hot plugging.
  *
- * @param   pVCpu               The virtual CPU handle.
+ * @param   pVCpu               Pointer to the VMCPU.
  */
 VMMR3DECL(void) CPUMR3ResetCpu(PVMCPU pVCpu)
@@ -3605,10 +3605,10 @@
  *
  * @returns VBox status code.
- * @param   pVM         Pointer to the VM
- * @param   pVCpu       VMCPU Handle
- * @param   pCtx        CPU context
+ * @param   pVM         Pointer to the VM.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @param   pCtx        Pointer to the guest CPU context.
  * @param   GCPtrPC     Program counter (relative to CS) to disassemble from.
- * @param   pCpu        Disassembly state
- * @param   pszPrefix   String prefix for logging (debug only)
+ * @param   pCpu        Disassembly state.
+ * @param   pszPrefix   String prefix for logging (debug only).
  *
  */
@@ -4000,5 +4000,5 @@
  * Leaves REM and works the CPUM_CHANGED_HIDDEN_SEL_REGS_INVALID flag.
  *
- * @param   pVCpu               The virtual CPU handle.
+ * @param   pVCpu               Pointer to the VMCPU.
  * @param   fNoOutOfSyncSels    This is @c false if there are out of sync
  *                              registers.
Index: /trunk/src/VBox/VMM/VMMR3/CPUMDbg.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/CPUMDbg.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/CPUMDbg.cpp	(revision 41803)
@@ -171,5 +171,5 @@
  *
  * @returns true if it is, false if it's in FNSAVE.
- * @param   pVCpu               The virtual CPU handle.
+ * @param   pVCpu               Pointer to the VMCPU.
  */
 DECLINLINE(bool) cpumR3RegIsFxSaveFormat(PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMR3/DBGFAddr.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/DBGFAddr.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/DBGFAddr.cpp	(revision 41803)
@@ -215,5 +215,5 @@
  *
  * @returns VBox status code.
- * @param   pVCpu           The virtual CPU handle.
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   pAddress        The address.
  * @param   pGCPhys         Where to return the physical address.
Index: /trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp	(revision 41803)
@@ -90,6 +90,6 @@
  *
  * @returns VBox status code.
- * @param   pVM         Pointer to the VM
- * @param   pVCpu       VMCPU handle
+ * @param   pVM         Pointer to the VM.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   pSelInfo    The selector info.
  * @param   enmMode     The guest paging mode.
@@ -323,5 +323,5 @@
  * @returns VBox status code.
  * @param       pVM             Pointer to the VM.
- * @param       pVCpu           The virtual CPU handle.
+ * @param       pVCpu           Pointer to the VMCPU.
  * @param       Sel             The code selector. This used to determine the 32/16 bit ness and
  *                              calculation of the actual instruction address.
@@ -653,5 +653,5 @@
  * @returns VBox status code.
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The virtual CPU handle, defaults to CPU 0 if NULL.
+ * @param   pVCpu           Pointer to the VMCPU, defaults to CPU 0 if NULL.
  * @param   Sel             The code selector. This used to determine the 32/16 bit-ness and
  *                          calculation of the actual instruction address.
Index: /trunk/src/VBox/VMM/VMMR3/DBGFReg.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/DBGFReg.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/DBGFReg.cpp	(revision 41803)
@@ -498,5 +498,5 @@
  * @returns VBox status code.
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The virtual CPU handle.
+ * @param   pVCpu           Pointer to the VMCPU.
  * @param   paRegisters     The register descriptors.
  * @param   fGuestRegs      Set if it's the guest registers, clear if
Index: /trunk/src/VBox/VMM/VMMR3/PDM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/PDM.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/PDM.cpp	(revision 41803)
@@ -1403,5 +1403,5 @@
  * Used by PDMR3Reset and CPU hot plugging.
  *
- * @param   pVCpu               The virtual CPU handle.
+ * @param   pVCpu               Pointer to the VMCPU.
  */
 VMMR3DECL(void) PDMR3ResetCpu(PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMR3/PGM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/PGM.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/PGM.cpp	(revision 41803)
@@ -2469,5 +2469,5 @@
  *
  * @param   pVM                 Pointer to the VM.
- * @param   pVCpu               The virtual CPU handle.
+ * @param   pVCpu               Pointer to the VMCPU.
  */
 VMMR3DECL(void) PGMR3ResetUnpluggedCpu(PVM pVM, PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMR3/PGMSharedPage.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/PGMSharedPage.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/PGMSharedPage.cpp	(revision 41803)
@@ -197,5 +197,5 @@
  * @returns VBox strict status code.
  * @param   pVM                 Pointer to the VM.
- * @param   pVCpu               The VMCPU handle for the calling EMT.
+ * @param   pVCpu               Pointer to the VMCPU of the calling EMT.
  * @param   pvUser              Pointer to a VMCPUID with the requester's ID.
  */
Index: /trunk/src/VBox/VMM/VMMR3/SELM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/SELM.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/SELM.cpp	(revision 41803)
@@ -2300,5 +2300,5 @@
  *
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   Sel         The selector to get info about.
  * @param   pSelInfo    Where to store the information.
Index: /trunk/src/VBox/VMM/VMMR3/TM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/TM.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/TM.cpp	(revision 41803)
@@ -2610,6 +2610,6 @@
  * @returns VBox status code, all errors are asserted.
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
- * @thread  EMT corresponding to the virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @thread  EMT corresponding to Pointer to the VMCPU.
  */
 VMMR3DECL(int) TMR3NotifySuspend(PVM pVM, PVMCPU pVCpu)
@@ -2653,6 +2653,6 @@
  * @returns VBox status code, all errors are asserted.
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
- * @thread  EMT corresponding to the virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
+ * @thread  EMT corresponding to Pointer to the VMCPU.
  */
 VMMR3DECL(int) TMR3NotifyResume(PVM pVM, PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMR3/TRPM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/TRPM.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/TRPM.cpp	(revision 41803)
@@ -730,5 +730,5 @@
  * Used by TRPMR3Reset and CPU hot plugging.
  *
- * @param   pVCpu               The virtual CPU handle.
+ * @param   pVCpu               Pointer to the VMCPU.
  */
 VMMR3DECL(void) TRPMR3ResetCpu(PVMCPU pVCpu)
Index: /trunk/src/VBox/VMM/VMMR3/VM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/VM.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/VM.cpp	(revision 41803)
@@ -1211,5 +1211,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The VMCPU handle of the EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the EMT.
  * @param   pvUser          Ignored.
  */
@@ -1300,5 +1300,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The VMCPU handle of the EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the EMT.
  * @param   pvUser          Ignored.
  */
@@ -1382,5 +1382,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The VMCPU handle of the EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the EMT.
  * @param   pvUser          Ignored.
  */
@@ -1464,5 +1464,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The VMCPU handle of the EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the EMT.
  * @param   pvUser          The pfSuspended argument of vmR3SaveTeleport.
  */
@@ -1564,5 +1564,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The VMCPU handle of the EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the EMT.
  * @param   pvUser          The pfSuspended argument of vmR3SaveTeleport.
  */
@@ -2156,5 +2156,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The VMCPU handle of the EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the EMT.
  * @param   pvUser          Ignored.
  */
@@ -2786,5 +2786,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The VMCPU handle of the EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the EMT.
  * @param   pvUser          Ignored.
  */
@@ -4089,5 +4089,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The VMCPU handle of the EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the EMT.
  * @param   pvUser          Ignored.
  */
Index: /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp	(revision 41803)
@@ -1190,5 +1190,5 @@
  * @returns VBox strict status code.
  * @param   pVM                 Pointer to the VM.
- * @param   pVCpu               The VMCPU handle for the calling EMT.
+ * @param   pVCpu               Pointer to the VMCPU of the calling EMT.
  * @param   pvUser              The new g_aHaltMethods index.
  */
Index: /trunk/src/VBox/VMM/VMMR3/VMM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/VMM.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMR3/VMM.cpp	(revision 41803)
@@ -2043,5 +2043,5 @@
  * @returns VBox status code.
  * @param   pVM     Pointer to the VM.
- * @param   pVCpu   VMCPU handle
+ * @param   pVCpu   Pointer to the VMCPU.
  * @remark  Careful with critsects.
  */
Index: /trunk/src/VBox/VMM/VMMRC/SELMRC.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMRC/SELMRC.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMRC/SELMRC.cpp	(revision 41803)
@@ -259,5 +259,5 @@
  * Read wrapper used by selmRCGuestTSSWriteHandler.
  * @returns VBox status code (appropriate for trap handling and GC return).
- * @param   pVM         The VM handle
+ * @param   pVM         Pointer to the VM.
  * @param   pvDst       Where to put the bits we read.
  * @param   pvSrc       Guest address to read from.
Index: /trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp	(revision 41803)
@@ -128,5 +128,5 @@
  *          happened.
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   rc          The VBox status code to return.
  * @param   pRegFrame   Pointer to the register frame for the trap.
@@ -720,5 +720,5 @@
  *
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   pRegFrame   Pointer to the register frame for the trap.
  * @param   pCpu        The opcode info.
@@ -820,5 +820,5 @@
  *
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   pRegFrame   Pointer to the register frame for the trap.
  * @param   pCpu        The opcode info.
@@ -913,5 +913,5 @@
  *
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   pRegFrame   Pointer to the register frame for the trap.
  *                      This will be updated on successful return.
Index: /trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp	(revision 41803)
@@ -39,5 +39,5 @@
  *
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   pRegFrame   Pointer to the register frame for the trap.
  * @param   uDr6        The DR6 register value.
@@ -107,5 +107,5 @@
  *
  * @param   pVM         Pointer to the VM.
- * @param   pVCpu       The virtual CPU handle.
+ * @param   pVCpu       Pointer to the VMCPU.
  * @param   pRegFrame   Pointer to the register frame for the trap.
  */
Index: /trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp	(revision 41802)
+++ /trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp	(revision 41803)
@@ -39,5 +39,5 @@
  *
  * @param   pVM             Pointer to the VM.
- * @param   pVCpu           The virtual CPU handle of the calling EMT.
+ * @param   pVCpu           Pointer to the VMCPU of the calling EMT.
  * @param   enmOperation    The operation.
  * @param   uArg            The argument to the operation.
Index: /trunk/src/VBox/VMM/include/EMHandleRCTmpl.h
===================================================================
--- /trunk/src/VBox/VMM/include/EMHandleRCTmpl.h	(revision 41802)
+++ /trunk/src/VBox/VMM/include/EMHandleRCTmpl.h	(revision 41803)
@@ -28,6 +28,6 @@
  * @returns VBox status code to return to the EM main loop.
  *
- * @param   pVM     The VM handle
- * @param   pVCpu   The VMCPU handle
+ * @param   pVM     Pointer to the VM.
+ * @param   pVCpu   Pointer to the VMCPU.
  * @param   rc      The return code.
  * @param   pCtx    The guest cpu context.