Index: /trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp	(revision 64235)
+++ /trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp	(revision 64236)
@@ -134,6 +134,6 @@
 static void                 supdrvTscDeltaThreadStartMeasurement(PSUPDRVDEVEXT pDevExt, bool fForceAll);
 #else
-static int                  supdrvMeasureInitialTscDeltas(PSUPDRVDEVEXT pDevExt);
-static int                  supdrvMeasureTscDeltaOne(PSUPDRVDEVEXT pDevExt, uint32_t idxWorker);
+static int                  supdrvTscMeasureInitialDeltas(PSUPDRVDEVEXT pDevExt);
+static int                  supdrvTscMeasureDeltaOne(PSUPDRVDEVEXT pDevExt, uint32_t idxWorker);
 #endif
 
@@ -898,5 +898,5 @@
 #else
             RTCpuSetCopy(&pDevExt->TscDeltaCpuSet, &pGip->OnlineCpuSet);
-            supdrvMeasureInitialTscDeltas(pDevExt);
+            supdrvTscMeasureInitialDeltas(pDevExt);
 #endif
         }
@@ -1424,5 +1424,5 @@
 #else
                     uint32_t iCpu = supdrvGipFindOrAllocCpuIndexForCpuId(pGip, idCpu);
-                    supdrvMeasureTscDeltaOne(pDevExt, iCpu);
+                    supdrvTscMeasureDeltaOne(pDevExt, iCpu);
 #endif
                 }
@@ -1925,5 +1925,5 @@
                         do
                         {
-                            rc = supdrvMeasureInitialTscDeltas(pDevExt);
+                            rc = supdrvTscMeasureInitialDeltas(pDevExt);
                             if (   rc != VERR_TRY_AGAIN
                                 && rc != VERR_CPU_OFFLINE)
@@ -1984,5 +1984,5 @@
     }
     else
-        OSDBGPRINT(("supdrvGipCreate: supdrvMeasureInitialTscDeltas failed. rc=%Rrc\n", rc));
+        OSDBGPRINT(("supdrvGipCreate: supdrvTscMeasureInitialDeltas failed. rc=%Rrc\n", rc));
 
     /* Releases timer frequency increase too. */
@@ -2612,5 +2612,5 @@
 
 /**
- * Argument package/state passed by supdrvMeasureTscDeltaOne() to the RTMpOn
+ * Argument package/state passed by supdrvTscMeasureDeltaOne() to the RTMpOn
  * callback worker.
  * @todo add
@@ -2624,5 +2624,5 @@
     /** Pointer to the GIP CPU array entry for the master. */
     PSUPGIPCPU                  pMaster;
-    /** The maximum number of ticks to spend in supdrvMeasureTscDeltaCallback.
+    /** The maximum number of ticks to spend in supdrvTscMeasureDeltaCallback.
      * (This is what we need a rough TSC frequency for.)  */
     uint64_t                    cMaxTscTicks;
@@ -3501,5 +3501,5 @@
 /**
  * Handles the special abort procedure during synchronization setup in
- * supdrvMeasureTscDeltaCallbackUnwrapped().
+ * supdrvTscMeasureDeltaCallbackUnwrapped().
  *
  * @returns 0 (dummy, ignored)
@@ -3510,5 +3510,5 @@
  */
 DECL_NO_INLINE(static, int)
-supdrvMeasureTscDeltaCallbackAbortSyncSetup(PSUPDRVGIPTSCDELTARGS pArgs, PSUPTSCDELTASYNC2 pMySync, bool fIsMaster, bool fTimeout)
+supdrvTscMeasureDeltaCallbackAbortSyncSetup(PSUPDRVGIPTSCDELTARGS pArgs, PSUPTSCDELTASYNC2 pMySync, bool fIsMaster, bool fTimeout)
 {
     PSUPTSCDELTASYNC2 volatile *ppMySync    = fIsMaster ? &pArgs->pSyncMaster : &pArgs->pSyncWorker;
@@ -3543,5 +3543,5 @@
 
 /**
- * This is used by supdrvMeasureInitialTscDeltas() to read the TSC on two CPUs
+ * This is used by supdrvTscMeasureInitialDeltas() to read the TSC on two CPUs
  * and compute the delta between them.
  *
@@ -3560,5 +3560,5 @@
  *          doing this on x86 CPUs.
  */
-static int supdrvMeasureTscDeltaCallbackUnwrapped(RTCPUID idCpu, PSUPDRVGIPTSCDELTARGS pArgs)
+static int supdrvTscMeasureDeltaCallbackUnwrapped(RTCPUID idCpu, PSUPDRVGIPTSCDELTARGS pArgs)
 {
     PSUPDRVDEVEXT               pDevExt          = pArgs->pDevExt;
@@ -3606,8 +3606,8 @@
         if (   ASMAtomicReadBool(&pArgs->fAbortSetup)
             || !RTMpIsCpuOnline(fIsMaster ? pGipCpuWorker->idCpu : pGipCpuMaster->idCpu) )
-            return supdrvMeasureTscDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, false /*fTimeout*/);
+            return supdrvTscMeasureDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, false /*fTimeout*/);
         if (   (iTry++ & 0xff) == 0
             && ASMReadTSC() - MySync.uTscStart > pArgs->cMaxTscTicks)
-            return supdrvMeasureTscDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, true /*fTimeout*/);
+            return supdrvTscMeasureDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, true /*fTimeout*/);
         TSCDELTA_DBG_CHECK_LOOP();
         ASMNopPause();
@@ -3617,5 +3617,5 @@
     if (fIsMaster)
         if (!ASMAtomicCmpXchgU32(&pOtherSync->uSyncVar, GIP_TSC_DELTA_SYNC2_READY, GIP_TSC_DELTA_SYNC2_PRESTART_WAIT)) /* parnaoia */
-            return supdrvMeasureTscDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, false /*fTimeout*/);
+            return supdrvTscMeasureDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, false /*fTimeout*/);
 
     iTry = 0;
@@ -3625,5 +3625,5 @@
         ASMNopPause();
         if (ASMAtomicReadBool(&pArgs->fAbortSetup))
-            return supdrvMeasureTscDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, false /*fTimeout*/);
+            return supdrvTscMeasureDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, false /*fTimeout*/);
         if (   (iTry++ & 0xff) == 0
             && ASMReadTSC() - MySync.uTscStart > pArgs->cMaxTscTicks)
@@ -3632,5 +3632,5 @@
                 && !ASMAtomicCmpXchgU32(&MySync.uSyncVar, GIP_TSC_DELTA_SYNC2_PRESTART_ABORT, GIP_TSC_DELTA_SYNC2_PRESTART_WAIT))
                 break; /* race #1: slave has moved on, handle timeout in loop instead. */
-            return supdrvMeasureTscDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, true /*fTimeout*/);
+            return supdrvTscMeasureDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, true /*fTimeout*/);
         }
         TSCDELTA_DBG_CHECK_LOOP();
@@ -3639,5 +3639,5 @@
     if (!fIsMaster)
         if (!ASMAtomicCmpXchgU32(&pOtherSync->uSyncVar, GIP_TSC_DELTA_SYNC2_READY, GIP_TSC_DELTA_SYNC2_PRESTART_WAIT)) /* race #1 */
-            return supdrvMeasureTscDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, false /*fTimeout*/);
+            return supdrvTscMeasureDeltaCallbackAbortSyncSetup(pArgs, &MySync, fIsMaster, false /*fTimeout*/);
 
 /** @todo Add a resumable state to pArgs so we don't waste time if we time
@@ -3751,5 +3751,5 @@
 
 /**
- * Callback used by supdrvMeasureInitialTscDeltas() to read the TSC on two CPUs
+ * Callback used by supdrvTscMeasureInitialDeltas() to read the TSC on two CPUs
  * and compute the delta between them.
  *
@@ -3758,7 +3758,7 @@
  * @param   pvUser2     Unused.
  */
-static DECLCALLBACK(void) supdrvMeasureTscDeltaCallback(RTCPUID idCpu, void *pvUser1, void *pvUser2)
-{
-    supdrvMeasureTscDeltaCallbackUnwrapped(idCpu, (PSUPDRVGIPTSCDELTARGS)pvUser1);
+static DECLCALLBACK(void) supdrvTscMeasureDeltaCallback(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+{
+    supdrvTscMeasureDeltaCallbackUnwrapped(idCpu, (PSUPDRVGIPTSCDELTARGS)pvUser1);
     RT_NOREF1(pvUser2);
 }
@@ -3778,5 +3778,5 @@
  * @remarks This must be called with preemption enabled!
  */
-static int supdrvMeasureTscDeltaOne(PSUPDRVDEVEXT pDevExt, uint32_t idxWorker)
+static int supdrvTscMeasureDeltaOne(PSUPDRVDEVEXT pDevExt, uint32_t idxWorker)
 {
     int                 rc;
@@ -3877,5 +3877,5 @@
             /*
              * Do the RTMpOnPair call.  We reset i64TSCDelta first so we
-             * and supdrvMeasureTscDeltaCallback can use it as a success check.
+             * and supdrvTscMeasureDeltaCallback can use it as a success check.
              */
             /** @todo Store the i64TSCDelta result in pArgs first?   Perhaps deals with
@@ -3883,5 +3883,5 @@
             ASMAtomicWriteS64(&pGipCpuWorker->i64TSCDelta, INT64_MAX);
             rc = RTMpOnPair(pGipCpuMaster->idCpu, pGipCpuWorker->idCpu, RTMPON_F_CONCURRENT_EXEC,
-                            supdrvMeasureTscDeltaCallback, pArgs, NULL);
+                            supdrvTscMeasureDeltaCallback, pArgs, NULL);
             if (RT_SUCCESS(rc))
             {
@@ -4022,5 +4022,5 @@
  *          supdrvGipInitOnCpu().
  */
-static int supdrvMeasureInitialTscDeltas(PSUPDRVDEVEXT pDevExt)
+static int supdrvTscMeasureInitialDeltas(PSUPDRVDEVEXT pDevExt)
 {
     PSUPGIPCPU pGipCpuMaster;
@@ -4066,8 +4066,8 @@
                 && RTCpuSetIsMemberByIndex(&pDevExt->TscDeltaCpuSet, pGipCpuWorker->iCpuSet))
             {
-                rc = supdrvMeasureTscDeltaOne(pDevExt, iCpu);
+                rc = supdrvTscMeasureDeltaOne(pDevExt, iCpu);
                 if (RT_FAILURE(rc))
                 {
-                    SUPR0Printf("supdrvMeasureTscDeltaOne failed. rc=%d CPU[%u].idCpu=%u Master[%u].idCpu=%u\n", rc, iCpu,
+                    SUPR0Printf("supdrvTscMeasureDeltaOne failed. rc=%d CPU[%u].idCpu=%u Master[%u].idCpu=%u\n", rc, iCpu,
                                 pGipCpuWorker->idCpu, idxMaster, pDevExt->idGipMaster, pGipCpuMaster->idCpu);
                     break;
@@ -4183,5 +4183,5 @@
                     {
                         RTCpuSetCopy(&pDevExt->TscDeltaCpuSet, &pGip->OnlineCpuSet);
-                        rc = supdrvMeasureInitialTscDeltas(pDevExt);
+                        rc = supdrvTscMeasureInitialDeltas(pDevExt);
                         if (   RT_SUCCESS(rc)
                             || (   RT_FAILURE(rc)
@@ -4209,5 +4209,5 @@
                             if (pGipCpuWorker->i64TSCDelta == INT64_MAX)
                             {
-                                int rc2 = supdrvMeasureTscDeltaOne(pDevExt, iCpu);
+                                int rc2 = supdrvTscMeasureDeltaOne(pDevExt, iCpu);
                                 if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
                                     rc = rc2;
@@ -4611,5 +4611,5 @@
 
         /* Measure it. */
-        rc = supdrvMeasureTscDeltaOne(pDevExt, iGipCpu);
+        rc = supdrvTscMeasureDeltaOne(pDevExt, iGipCpu);
         if (rc != VERR_SUPDRV_TSC_DELTA_MEASUREMENT_FAILED)
         {
@@ -4748,5 +4748,5 @@
 
                 /* Need to measure the delta an try again. */
-                rc = supdrvMeasureTscDeltaOne(pDevExt, iGipCpu);
+                rc = supdrvTscMeasureDeltaOne(pDevExt, iGipCpu);
                 Assert(pGip->aCPUs[iGipCpu].i64TSCDelta != INT64_MAX || RT_FAILURE_NP(rc));
                 /** @todo should probably delay on failure... dpc watchdogs */