Index: /trunk/include/VBox/hwaccm.h
===================================================================
--- /trunk/include/VBox/hwaccm.h	(revision 30240)
+++ /trunk/include/VBox/hwaccm.h	(revision 30241)
@@ -102,7 +102,4 @@
 VMMR0DECL(int)          HWACCMR0LeaveSwitcher(PVM pVM, bool fVTxDisabled);
 
-VMMR0DECL(PVMCPU)       HWACCMR0GetVMCPU(PVM pVM);
-VMMR0DECL(VMCPUID)      HWACCMR0GetVMCPUId(PVM pVM);
-
 VMMR0DECL(void)         HWACCMR0SavePendingIOPortWrite(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext, unsigned uPort, unsigned uAndVal, unsigned cbSize);
 VMMR0DECL(void)         HWACCMR0SavePendingIOPortRead(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext, unsigned uPort, unsigned uAndVal, unsigned cbSize);
Index: /trunk/src/VBox/VMM/VMMAll/VMMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/VMMAll.cpp	(revision 30240)
+++ /trunk/src/VBox/VMM/VMMAll/VMMAll.cpp	(revision 30241)
@@ -59,5 +59,17 @@
     if (pVM->cCpus == 1)
         return 0;
-    return HWACCMR0GetVMCPUId(pVM);
+
+    /* RTMpCpuId had better be cheap. */
+    RTCPUID idHostCpu = RTMpCpuId();
+
+    /** @todo optimize for large number of VCPUs when that becomes more common. */
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+        if (pVCpu->idHostCpu == idHostCpu)
+            return pVCpu->idCpu;
+    }
+    return NIL_VMCPUID;
 
 #else /* RC: Always EMT(0) */
@@ -86,5 +98,17 @@
     if (pVM->cCpus == 1)
         return &pVM->aCpus[0];
-    return HWACCMR0GetVMCPU(pVM);
+
+    /* RTMpCpuId had better be cheap. */
+    RTCPUID idHostCpu = RTMpCpuId();
+
+    /** @todo optimize for large number of VCPUs when that becomes more common. */
+    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+        if (pVCpu->idHostCpu == idHostCpu)
+            return pVCpu;
+    }
+    return NULL;
 
 #else /* RC: Always EMT(0) */
Index: /trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp	(revision 30240)
+++ /trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp	(revision 30241)
@@ -1317,39 +1317,4 @@
 {
     return &HWACCMR0Globals.aCpuInfo[idCpu];
-}
-
-/**
- * Returns the VMCPU of the current EMT thread.
- *
- * @param   pVM         The VM to operate on.
- */
-VMMR0DECL(PVMCPU)  HWACCMR0GetVMCPU(PVM pVM)
-{
-    /* RTMpCpuId had better be cheap. */
-    RTCPUID idHostCpu = RTMpCpuId();
-
-    /** @todo optimize for large number of VCPUs when that becomes more common. */
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[idCpu];
-
-        if (pVCpu->hwaccm.s.idEnteredCpu == idHostCpu)
-            return pVCpu;
-    }
-    return NULL;
-}
-
-/**
- * Returns the VMCPU id of the current EMT thread.
- *
- * @param   pVM         The VM to operate on.
- */
-VMMR0DECL(VMCPUID) HWACCMR0GetVMCPUId(PVM pVM)
-{
-    PVMCPU pVCpu = HWACCMR0GetVMCPU(pVM);
-    if (pVCpu)
-        return pVCpu->idCpu;
-
-    return 0;
 }