Index: /trunk/src/VBox/VMM/VMMR0/HMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMR0.cpp	(revision 65315)
+++ /trunk/src/VBox/VMM/VMMR0/HMR0.cpp	(revision 65316)
@@ -1610,22 +1610,8 @@
  * @returns The cpu structure pointer.
  */
-VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpu(void)
+VMMR0DECL(PHMGLOBALCPUINFO) hmR0GetCurrentCpu(void)
 {
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     RTCPUID idCpu = RTMpCpuId();
-    Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
-    return &g_HmR0.aCpuInfo[idCpu];
-}
-
-
-/**
- * Returns the cpu structure for the current cpu.
- * Keep in mind that there is no guarantee it will stay the same (long jumps to ring 3!!!).
- *
- * @returns The cpu structure pointer.
- * @param   idCpu       id of the VCPU.
- */
-VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpuEx(RTCPUID idCpu)
-{
     Assert(idCpu < RT_ELEMENTS(g_HmR0.aCpuInfo));
     return &g_HmR0.aCpuInfo[idCpu];
@@ -1715,5 +1701,5 @@
 
     /* Ok, disable VT-x. */
-    PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
+    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
     AssertReturn(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ && pCpu->pvMemObj && pCpu->HCPhysMemObj != NIL_RTHCPHYS, VERR_HM_IPE_2);
 
@@ -1745,5 +1731,5 @@
         Assert(g_HmR0.fGlobalInit);
 
-        PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
+        PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
         AssertReturnVoid(pCpu && pCpu->hMemObj != NIL_RTR0MEMOBJ && pCpu->pvMemObj && pCpu->HCPhysMemObj != NIL_RTHCPHYS);
 
Index: /trunk/src/VBox/VMM/VMMR0/HMR0A.asm
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMR0A.asm	(revision 65315)
+++ /trunk/src/VBox/VMM/VMMR0/HMR0A.asm	(revision 65316)
@@ -795,5 +795,5 @@
 ; load the guest ones when necessary.
 ;
-; @cproto       DECLASM(int) HMR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
+; @cproto       DECLASM(int) HMR0VMXStartVMhmR0DumpDescriptorM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
 ;
 ; @returns      eax
@@ -806,9 +806,9 @@
 ; @param        pfnStartVM      msc:[rbp+38h]
 ;
-; @remarks      This is essentially the same code as HMR0SVMRunWrapXMM, only the parameters differ a little bit.
+; @remarks      This is essentially the same code as hmR0SVMRunWrapXMM, only the parameters differ a little bit.
 ;
 ; ASSUMING 64-bit and windows for now.
 ALIGNCODE(16)
-BEGINPROC HMR0VMXStartVMWrapXMM
+BEGINPROC hmR0VMXStartVMWrapXMM
         push    xBP
         mov     xBP, xSP
@@ -957,5 +957,5 @@
         movdqa  [r10 + XMM_OFF_IN_X86FXSTATE + 0f0h], xmm15
         jmp     .restore_non_volatile_host_xmm_regs
-ENDPROC   HMR0VMXStartVMWrapXMM
+ENDPROC   hmR0VMXStartVMWrapXMM
 
 ;;
@@ -963,5 +963,5 @@
 ; load the guest ones when necessary.
 ;
-; @cproto       DECLASM(int) HMR0SVMRunWrapXMM(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
+; @cproto       DECLASM(int) hmR0SVMRunWrapXMM(RTHCPHYS pVMCBHostPhys, RTHCPHYS pVMCBPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
 ;
 ; @returns      eax
@@ -974,9 +974,9 @@
 ; @param        pfnVMRun        msc:[rbp+38h]
 ;
-; @remarks      This is essentially the same code as HMR0VMXStartVMWrapXMM, only the parameters differ a little bit.
+; @remarks      This is essentially the same code as hmR0VMXStartVMWrapXMM, only the parameters differ a little bit.
 ;
 ; ASSUMING 64-bit and windows for now.
 ALIGNCODE(16)
-BEGINPROC HMR0SVMRunWrapXMM
+BEGINPROC hmR0SVMRunWrapXMM
         push    xBP
         mov     xBP, xSP
@@ -1125,5 +1125,5 @@
         movdqa  [r10 + XMM_OFF_IN_X86FXSTATE + 0f0h], xmm15
         jmp     .restore_non_volatile_host_xmm_regs
-ENDPROC   HMR0SVMRunWrapXMM
+ENDPROC   hmR0SVMRunWrapXMM
 
 %endif ; VBOX_WITH_KERNEL_USING_XMM
Index: /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp	(revision 65315)
+++ /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp	(revision 65316)
@@ -885,5 +885,5 @@
     PVM pVM              = pVCpu->CTX_SUFF(pVM);
     PSVMVMCB pVmcb       = (PSVMVMCB)pVCpu->hm.s.svm.pvVmcb;
-    PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
+    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
 
     /*
@@ -2772,5 +2772,5 @@
     if (rcVMRun == VERR_SVM_INVALID_GUEST_STATE)
     {
-        HMDumpRegs(pVM, pVCpu, pCtx); NOREF(pVM);
+        hmDumpRegs(pVM, pVCpu, pCtx); NOREF(pVM);
 #ifdef VBOX_STRICT
         Log4(("ctrl.u64VmcbCleanBits             %#RX64\n",   pVmcb->ctrl.u64VmcbCleanBits));
@@ -3145,5 +3145,5 @@
 
     /* Setup TSC offsetting. */
-    RTCPUID idCurrentCpu = HMR0GetCurrentCpu()->idCpu;
+    RTCPUID idCurrentCpu = hmR0GetCurrentCpu()->idCpu;
     if (   pSvmTransient->fUpdateTscOffsetting
         || idCurrentCpu != pVCpu->hm.s.idLastCpu)
@@ -3175,5 +3175,5 @@
     ASMAtomicWriteBool(&pVCpu->hm.s.fCheckedTLBFlush, true);    /* Used for TLB flushing, set this across the world switch. */
     hmR0SvmFlushTaggedTlb(pVCpu);
-    Assert(HMR0GetCurrentCpu()->idCpu == pVCpu->hm.s.idLastCpu);
+    Assert(hmR0GetCurrentCpu()->idCpu == pVCpu->hm.s.idLastCpu);
 
     STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatEntry, &pVCpu->hm.s.StatInGC, x);
Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 65315)
+++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 65316)
@@ -5008,5 +5008,5 @@
     /** @todo Add stats for resume vs launch. */
 #ifdef VBOX_WITH_KERNEL_USING_XMM
-    int rc = HMR0VMXStartVMWrapXMM(fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hm.s.vmx.pfnStartVM);
+    int rc = hmR0VMXStartVMWrapXMM(fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hm.s.vmx.pfnStartVM);
 #else
     int rc = pVCpu->hm.s.vmx.pfnStartVM(fResumeVM, pCtx, &pVCpu->hm.s.vmx.VMCSCache, pVM, pVCpu);
@@ -5147,5 +5147,5 @@
                 {
                     pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
-                    HMR0DumpDescriptor(pDesc, u32Val, "CS: ");
+                    hmR0DumpDescriptor(pDesc, u32Val, "CS: ");
                 }
 
@@ -5155,5 +5155,5 @@
                 {
                     pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
-                    HMR0DumpDescriptor(pDesc, u32Val, "DS: ");
+                    hmR0DumpDescriptor(pDesc, u32Val, "DS: ");
                 }
 
@@ -5163,5 +5163,5 @@
                 {
                     pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
-                    HMR0DumpDescriptor(pDesc, u32Val, "ES: ");
+                    hmR0DumpDescriptor(pDesc, u32Val, "ES: ");
                 }
 
@@ -5171,5 +5171,5 @@
                 {
                     pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
-                    HMR0DumpDescriptor(pDesc, u32Val, "FS: ");
+                    hmR0DumpDescriptor(pDesc, u32Val, "FS: ");
                 }
 
@@ -5179,5 +5179,5 @@
                 {
                     pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
-                    HMR0DumpDescriptor(pDesc, u32Val, "GS: ");
+                    hmR0DumpDescriptor(pDesc, u32Val, "GS: ");
                 }
 
@@ -5187,5 +5187,5 @@
                 {
                     pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
-                    HMR0DumpDescriptor(pDesc, u32Val, "SS: ");
+                    hmR0DumpDescriptor(pDesc, u32Val, "SS: ");
                 }
 
@@ -5195,5 +5195,5 @@
                 {
                     pDesc  = (PCX86DESCHC)(HostGdtr.pGdt + (u32Val & X86_SEL_MASK));
-                    HMR0DumpDescriptor(pDesc, u32Val, "TR: ");
+                    hmR0DumpDescriptor(pDesc, u32Val, "TR: ");
                 }
 
@@ -5315,5 +5315,5 @@
 #endif
 
-    PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
+    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
     RTHCPHYS HCPhysCpuPage = pCpu->HCPhysMemObj;
 
@@ -5376,5 +5376,5 @@
     NOREF(fResume);
 
-    PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
+    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
     RTHCPHYS HCPhysCpuPage = pCpu->HCPhysMemObj;
 
@@ -8845,5 +8845,5 @@
         pVmxTransient->u8GuestTpr = pVCpu->hm.s.vmx.pbVirtApic[XAPIC_OFF_TPR];
 
-    PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
+    PHMGLOBALCPUINFO pCpu = hmR0GetCurrentCpu();
     RTCPUID  idCurrentCpu = pCpu->idCpu;
     if (   pVmxTransient->fUpdateTscOffsettingAndPreemptTimer
@@ -11984,5 +11984,5 @@
 #endif
 
-    HMDumpRegs(pVCpu->CTX_SUFF(pVM), pVCpu, pMixedCtx);
+    hmDumpRegs(pVCpu->CTX_SUFF(pVM), pVCpu, pMixedCtx);
     return VERR_VMX_INVALID_GUEST_STATE;
 }
Index: /trunk/src/VBox/VMM/include/HMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/include/HMInternal.h	(revision 65315)
+++ /trunk/src/VBox/VMM/include/HMInternal.h	(revision 65316)
@@ -1099,22 +1099,17 @@
 
 #ifdef IN_RING0
-/** @todo r=bird: s/[[:space:]]HM/ hm/ - internal functions starts with a
- *        lower cased prefix.  HMInternal.h is an internal header, so
- *        everything here must be internal. */
-VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpu(void);
-VMMR0DECL(PHMGLOBALCPUINFO) HMR0GetCurrentCpuEx(RTCPUID idCpu);
-
+VMMR0DECL(PHMGLOBALCPUINFO) hmR0GetCurrentCpu(void);
 
 # ifdef VBOX_STRICT
-VMMR0DECL(void) HMDumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
-VMMR0DECL(void) HMR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg);
+VMMR0DECL(void) hmDumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
+VMMR0DECL(void) hmR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg);
 # else
-#  define HMDumpRegs(a, b ,c)            do { } while (0)
-#  define HMR0DumpDescriptor(a, b, c)    do { } while (0)
+#  define hmDumpRegs(a, b ,c)            do { } while (0)
+#  define hmR0DumpDescriptor(a, b, c)    do { } while (0)
 # endif /* VBOX_STRICT */
 
 # ifdef VBOX_WITH_KERNEL_USING_XMM
-DECLASM(int) HMR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
-DECLASM(int) HMR0SVMRunWrapXMM(RTHCPHYS pVmcbHostPhys, RTHCPHYS pVmcbPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
+DECLASM(int) hmR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHMVMXSTARTVM pfnStartVM);
+DECLASM(int) hmR0SVMRunWrapXMM(RTHCPHYS pVmcbHostPhys, RTHCPHYS pVmcbPhys, PCPUMCTX pCtx, PVM pVM, PVMCPU pVCpu, PFNHMSVMVMRUN pfnVMRun);
 # endif