Changeset 2611 in vbox

Timestamp:

May 14, 2007 4:58:51 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

21124

Message:

UCTOffset (ns).

Location:

trunk/src/VBox/VMM

Files:

• TM.cpp (modified) (37 diffs)
• TMInternal.h (modified) (7 diffs)
• VMMAll/TMAllVirtual.cpp (modified) (13 diffs)

trunk/src/VBox/VMM/TM.cpp

@@ -26 +26 @@
  * device and drivers.
  *
- * 
+ *
  * @section sec_tm_clocks   Clocks
- * 
+ *
  * There are currently 4 clocks:
  *   - Virtual (guest).
  *   - Synchronous virtual (guest).
- *   - CPU Tick (TSC) (guest). Only current use is rdtsc emulation. Usually a 
+ *   - CPU Tick (TSC) (guest). Only current use is rdtsc emulation. Usually a
  *     function of the virtual clock.
- *   - Real (host). The only current use is display updates for not real 
+ *   - Real (host). The only current use is display updates for not real
  *     good reason...
- * 
- * The interesting clocks are two first ones, the virtual and synchronous virtual 
- * clock. The synchronous virtual clock is tied to the virtual clock except that 
+ *
+ * The interesting clocks are two first ones, the virtual and synchronous virtual
+ * clock. The synchronous virtual clock is tied to the virtual clock except that
  * it will take into account timer delivery lag caused by host scheduling. It will
  * normally never advance beyond the header timer, and when lagging too far behind
  * it will gradually speed up to catch up with the virtual clock.
  *
- * The CPU tick (TSC) is normally virtualized as a function of the virtual time, 
+ * The CPU tick (TSC) is normally virtualized as a function of the virtual time,
  * where the frequency defaults to the host cpu frequency (as we measure it). It
  * can also use the host TSC as source and either present it with an offset or
- * unmodified. It is of course possible to configure the TSC frequency and mode 
+ * unmodified. It is of course possible to configure the TSC frequency and mode
  * of operation.
- * 
+ *
  * @subsection subsec_tm_timesync Guest Time Sync / UTC time
- * 
+ *
  * Guest time syncing is primarily taken care of by the VMM device. The principle
- * is very simple, the guest additions periodically asks the VMM device what the 
- * current UTC time is and makes adjustments accordingly. Now, because the 
+ * is very simple, the guest additions periodically asks the VMM device what the
+ * current UTC time is and makes adjustments accordingly. Now, because the
  * synchronous virtual clock might be doing catchups and we would therefore
  * deliver more than the normal rate for a little while, some adjusting of the
- * UTC time is required before passing it on to the guest. This is why TM provides 
+ * UTC time is required before passing it on to the guest. This is why TM provides
  * an API for query the current UTC time.
  *
- * 
+ *
  * @section sec_tm_timers   Timers
  *
  * The timers can use any of the TM clocks described in the previous section. Each
  * clock has its own scheduling facility, or timer queue if you like. There are
- * a few factors which makes it a bit complex. First there is the usual R0 vs R3 
+ * a few factors which makes it a bit complex. First there is the usual R0 vs R3
  * vs. GC thing. Then there is multiple threads, and then there is the timer thread
- * that periodically checks whether any timers has expired without EMT noticing. On 
+ * that periodically checks whether any timers has expired without EMT noticing. On
  * the API level, all but the create and save APIs must be mulithreaded. EMT will
  * always run the timers.
  *
  * The design is using a doubly linked list of active timers which is ordered
- * by expire date. This list is only modified by the EMT thread. Updates to the 
- * list are are batched in a singly linked list, which is then process by the EMT 
- * thread at the first opportunity (immediately, next time EMT modifies a timer 
+ * by expire date. This list is only modified by the EMT thread. Updates to the
+ * list are are batched in a singly linked list, which is then process by the EMT
+ * thread at the first opportunity (immediately, next time EMT modifies a timer
  * on that clock, or next timer timeout). Both lists are offset based and all
  * the elements therefore allocated from the hyper heap.
@@ -83 +83 @@
  *    - Poll the virtual clocks and calculate first timeout from the halt loop.
  *    - Employ a thread which periodically (100Hz) polls all the timer queues.
- * 
- * 
+ *
+ *
  * @section sec_tm_timer    Logging
- * 
+ *
  * Level 2: Logs a most of the timer state transitions and queue servicing.
  * Level 3: Logs a few oddments.
  * Level 4: Logs TMCLOCK_VIRTUAL_SYNC catch-up events.
- * 
+ *
  */
 
@@ -241 +241 @@
         pVM->tm.s.fTSCVirtualized = true; /* trap rdtsc */
     else if (VBOX_FAILURE(rc))
-        return VMSetError(pVM, rc, RT_SRC_POS, 
-                          N_("Configuration error: Failed to querying bool value \"UseRealTSC\". (%Vrc)"), rc); 
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to querying bool value \"UseRealTSC\". (%Vrc)"), rc);
 
     /* source */
@@ -249 +249 @@
         pVM->tm.s.fTSCUseRealTSC = false; /* use virtual time */
     else if (VBOX_FAILURE(rc))
-        return VMSetError(pVM, rc, RT_SRC_POS, 
-                          N_("Configuration error: Failed to querying bool value \"UseRealTSC\". (%Vrc)"), rc); 
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to querying bool value \"UseRealTSC\". (%Vrc)"), rc);
     if (!pVM->tm.s.fTSCUseRealTSC)
         pVM->tm.s.fTSCVirtualized = true;
@@ -277 +277 @@
     }
     else if (VBOX_FAILURE(rc))
-        return VMSetError(pVM, rc, RT_SRC_POS, 
-                          N_("Configuration error: Failed to querying uint64_t value \"TSCTicksPerSecond\". (%Vrc)"), rc); 
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to querying uint64_t value \"TSCTicksPerSecond\". (%Vrc)"), rc);
     else if (   pVM->tm.s.cTSCTicksPerSecond < _1M
              || pVM->tm.s.cTSCTicksPerSecond >= _4G)
-        return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS, 
+        return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
                           N_("Configuration error: \"TSCTicksPerSecond\" = %RI64 is not in the range 1MHz..4GHz-1!"),
                           pVM->tm.s.cTSCTicksPerSecond);
@@ -295 +295 @@
     else
         CPUMR3SetCR4Feature(pVM, 0, ~X86_CR4_TSD);
-    LogRel(("TM: cTSCTicksPerSecond=%#RX64 (%RU64) fTSCVirtualized=%RTbool fTSCUseRealTSC=%RTbool fMaybeUseOffsettedHostTSC=%RTbool\n", 
-            pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.fTSCVirtualized, 
+    LogRel(("TM: cTSCTicksPerSecond=%#RX64 (%RU64) fTSCVirtualized=%RTbool fTSCUseRealTSC=%RTbool fMaybeUseOffsettedHostTSC=%RTbool\n",
+            pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.fTSCVirtualized,
             pVM->tm.s.fTSCUseRealTSC, pVM->tm.s.fMaybeUseOffsettedHostTSC));
 
@@ -306 +306 @@
         pVM->tm.s.u32VirtualSyncScheduleSlack           =   100000; /* 0.100ms (ASSUMES virtual time is nanoseconds) */
     else if (VBOX_FAILURE(rc))
-        return VMSetError(pVM, rc, RT_SRC_POS, 
-                          N_("Configuration error: Failed to querying 32-bit integer value \"ScheduleSlack\". (%Vrc)"), rc); 
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to querying 32-bit integer value \"ScheduleSlack\". (%Vrc)"), rc);
 
     rc = CFGMR3QueryU64(pCfgHandle, "CatchUpStopThreshold", &pVM->tm.s.u64VirtualSyncCatchUpStopThreshold);
@@ -313 +313 @@
         pVM->tm.s.u64VirtualSyncCatchUpStopThreshold    =   500000; /* 0.5ms */
     else if (VBOX_FAILURE(rc))
-        return VMSetError(pVM, rc, RT_SRC_POS, 
-                          N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpStopThreshold\". (%Vrc)"), rc); 
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpStopThreshold\". (%Vrc)"), rc);
 
     rc = CFGMR3QueryU64(pCfgHandle, "CatchUpGiveUpThreshold", &pVM->tm.s.u64VirtualSyncCatchUpGiveUpThreshold);
@@ -320 +320 @@
         pVM->tm.s.u64VirtualSyncCatchUpGiveUpThreshold  = UINT64_C(60000000000); /* 60 sec */
     else if (VBOX_FAILURE(rc))
-        return VMSetError(pVM, rc, RT_SRC_POS, 
-                          N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpGiveUpThreshold\". (%Vrc)"), rc); 
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to querying 64-bit integer value \"CatchUpGiveUpThreshold\". (%Vrc)"), rc);
 
 
@@ -358 +358 @@
 
     /*
+     * Configure real world time (UCT).
+     */
+    rc = CFGMR3QueryS64(pCfgHandle, "UCTOffset", &pVM->tm.s.offUCT);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        pVM->tm.s.offUCT = 0; /* ns */
+    else if (VBOX_FAILURE(rc))
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to querying 64-bit integer value \"UCTOffset\". (%Vrc)"), rc);
+
+    /*
      * Setup the warp drive.
      */
@@ -366 +376 @@
         pVM->tm.s.u32VirtualWarpDrivePercentage = 100;
     else if (VBOX_FAILURE(rc))
-        return VMSetError(pVM, rc, RT_SRC_POS, 
-                          N_("Configuration error: Failed to querying uint32_t value \"WarpDrivePercent\". (%Vrc)"), rc); 
-    else if (   pVM->tm.s.u32VirtualWarpDrivePercentage < 2 
+        return VMSetError(pVM, rc, RT_SRC_POS,
+                          N_("Configuration error: Failed to querying uint32_t value \"WarpDrivePercent\". (%Vrc)"), rc);
+    else if (   pVM->tm.s.u32VirtualWarpDrivePercentage < 2
              || pVM->tm.s.u32VirtualWarpDrivePercentage > 20000)
-        return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS, 
+        return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
                           N_("Configuration error: \"WarpDrivePercent\" = %RI32 is not in the range 2..20000!"),
                           pVM->tm.s.u32VirtualWarpDrivePercentage);
@@ -385 +395 @@
         u32Millies = 10;
     else if (VBOX_FAILURE(rc))
-        return VMSetError(pVM, rc, RT_SRC_POS, 
+        return VMSetError(pVM, rc, RT_SRC_POS,
                           N_("Configuration error: Failed to query uint32_t value \"TimerMillies\", rc=%Vrc.\n"), rc);
     rc = RTTimerCreate(&pVM->tm.s.pTimer, u32Millies, tmR3TimerCallback, pVM);
@@ -480 +490 @@
 /**
  * Checks if the host CPU has a fixed TSC frequency.
- * 
+ *
  * @returns true if it has, false if it hasn't.
- * 
- * @remark  This test doesn't bother with very old CPUs that doesn't do power 
+ *
+ * @remark  This test doesn't bother with very old CPUs that doesn't do power
  *          management or any other stuff that might influence the TSC rate.
  *          This isn't currently relevant.
@@ -494 +504 @@
         ASMCpuId(0, &uEAX, &uEBX, &uECX, &uEDX);
         if (    uEAX >= 1
-            &&  uEBX == 0x68747541 
-            &&  uECX == 0x444d4163 
+            &&  uEBX == 0x68747541
+            &&  uECX == 0x444d4163
             &&  uEDX == 0x69746e65)
         {
-            /* 
+            /*
              * AuthenticAMD - Check for APM support and that TscInvariant is set.
              *
-             * This test isn't correct with respect to fixed/non-fixed TSC and 
+             * This test isn't correct with respect to fixed/non-fixed TSC and
              * older models, but this isn't relevant since the result is currently
              * only used for making a descision on AMD-V models.
@@ -518 +528 @@
                  &&  uEDX == 0x49656e69)
         {
-            /* 
+            /*
              * GenuineIntel - Check the model number.
-             * 
+             *
              * This test is lacking in the same way and for the same reasons
              * as the AMD test above.
@@ -552 +562 @@
     uint64_t    u64Hz;
     PCSUPGLOBALINFOPAGE pGip = g_pSUPGlobalInfoPage;
-    if (    pGip 
+    if (    pGip
         &&  pGip->u32Magic == SUPGLOBALINFOPAGE_MAGIC)
     {
@@ -564 +574 @@
             if (    pGip
                 &&  pGip->u32Magic == SUPGLOBALINFOPAGE_MAGIC
-                &&  (u64Hz = pGip->aCPUs[iCpu].u64CpuHz) 
+                &&  (u64Hz = pGip->aCPUs[iCpu].u64CpuHz)
                 &&  u64Hz != ~(uint64_t)0)
                 return u64Hz;
@@ -838 +848 @@
     else
         pVM->tm.s.cTSCTicksPerSecond = u64Hz;
-    LogRel(("TM: cTSCTicksPerSecond=%#RX64 (%RU64) fTSCVirtualized=%RTbool fTSCUseRealTSC=%RTbool (state load)\n", 
+    LogRel(("TM: cTSCTicksPerSecond=%#RX64 (%RU64) fTSCVirtualized=%RTbool fTSCUseRealTSC=%RTbool (state load)\n",
             pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.cTSCTicksPerSecond, pVM->tm.s.fTSCVirtualized, pVM->tm.s.fTSCUseRealTSC));
 
@@ -852 +862 @@
 /**
  * Internal TMR3TimerCreate worker.
- * 
+ *
  * @returns VBox status code.
  * @param   pVM         The VM handle.
@@ -1117 +1127 @@
 DECLINLINE(bool) tmR3AnyExpiredTimers(PVM pVM)
 {
-    /* 
+    /*
      * Combine the time calculation for the first two since we're not on EMT
      * TMVirtualSyncGet only permits EMT.
@@ -1124 +1134 @@
     if (pVM->tm.s.CTXALLSUFF(paTimerQueues)[TMCLOCK_VIRTUAL].u64Expire <= u64Now)
         return true;
-    u64Now = pVM->tm.s.fVirtualSyncTicking 
-           ? u64Now - pVM->tm.s.offVirtualSync 
+    u64Now = pVM->tm.s.fVirtualSyncTicking
+           ? u64Now - pVM->tm.s.offVirtualSync
            : pVM->tm.s.u64VirtualSync;
     if (pVM->tm.s.CTXALLSUFF(paTimerQueues)[TMCLOCK_VIRTUAL_SYNC].u64Expire <= u64Now)
@@ -1147 +1157 @@
  * @param   pvUser      VM handle.
  * @thread  Timer thread.
- * 
+ *
  * @remark  We cannot do the scheduling and queues running from a timer handler
  *          since it's not executing in EMT, and even if it was it would be async
@@ -1220 +1230 @@
     tmR3TimerQueueRun(pVM, &pVM->tm.s.paTimerQueuesR3[TMCLOCK_TSC]);
     STAM_PROFILE_ADV_SUSPEND(&pVM->tm.s.StatDoQueuesRun, r3);
-#endif 
+#endif
 
     /* TMCLOCK_REAL */
@@ -1319 +1329 @@
 
 /**
- * Schedules and runs any pending times in the timer queue for the 
+ * Schedules and runs any pending times in the timer queue for the
  * synchronous virtual clock.
- * 
+ *
  * This scheduling is a bit different from the other queues as it need
- * to implement the special requirements of the timer synchronous virtual 
+ * to implement the special requirements of the timer synchronous virtual
  * clock, thus this 2nd queue run funcion.
  *
@@ -1353 +1363 @@
      * this will be implemented at a later point if neccessary.
      *
-     * Without this frame we would 1) having to run timers much more frequently 
+     * Without this frame we would 1) having to run timers much more frequently
      * and 2) lag behind at a steady rate.
      */
@@ -1417 +1427 @@
                 ||  !(u64Max <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp)
                 ||  !(u64Now <= u64Max)))
-{                   
+{
     AssertMsg2("Add the following to defect #1414:\n"
                "                         u64Now=%016RX64\n"
@@ -1433 +1443 @@
                "            fVirtualSyncCatchUp=%RTbool (prev=%RTbool)\n",
                u64Now,
-               u64Max, 
+               u64Max,
                pNext->u64Expire,
                u64VirtualNow,
@@ -1443 +1453 @@
                pVM->tm.s.u64VirtualSyncCatchUpPrev,
                pVM->tm.s.u32VirtualSyncCatchUpPercentage,
-               pVM->tm.s.fVirtualSyncTicking, 
+               pVM->tm.s.fVirtualSyncTicking,
                pVM->tm.s.fVirtualSyncCatchUp, fWasInCatchup);
     Assert(u64Now <= u64VirtualNow - pVM->tm.s.offVirtualSyncGivenUp);
@@ -1508 +1518 @@
 
     /*
-     * Restart the clock if it was stopped to serve any timers, 
+     * Restart the clock if it was stopped to serve any timers,
      * and start/adjust catch-up if necessary.
      */
@@ -1552 +1562 @@
         Assert(!(offLag & RT_BIT_64(63)));
 
-        /* 
-         * Deal with starting, adjusting and stopping catchup. 
+        /*
+         * Deal with starting, adjusting and stopping catchup.
          */
         if (pVM->tm.s.fVirtualSyncCatchUp)
@@ -1615 +1625 @@
         }
 
-        /* 
-         * Update the offset and restart the clock. 
+        /*
+         * Update the offset and restart the clock.
          */
         ASMAtomicXchgU64(&pVM->tm.s.offVirtualSync, offNew);
@@ -1739 +1749 @@
     RTTimeNow(pTime);
     RTTimeSpecSubNano(pTime, pVM->tm.s.offVirtualSync - pVM->tm.s.offVirtualSyncGivenUp);
+    RTTimeSpecAddNano(pTime, pVM->tm.s.offUCT);
     return pTime;
 }
@@ -1814 +1825 @@
                             pTimer->offPrev,
                             pTimer->offScheduleNext,
-                            pTimer->enmClock == TMCLOCK_REAL 
-                            ? "Real " 
-                            : pTimer->enmClock == TMCLOCK_VIRTUAL 
+                            pTimer->enmClock == TMCLOCK_REAL
+                            ? "Real "
+                            : pTimer->enmClock == TMCLOCK_VIRTUAL
                             ? "Virt "
                             : pTimer->enmClock == TMCLOCK_VIRTUAL_SYNC
@@ -1849 +1860 @@
     const uint64_t u64Real = TMRealGet(pVM);
 
-    /* 
-     * TSC 
+    /*
+     * TSC
      */
     pHlp->pfnPrintf(pHlp,
-                    "Cpu Tick: %18RU64 (%#016RX64) %RU64Hz %s%s", 
+                    "Cpu Tick: %18RU64 (%#016RX64) %RU64Hz %s%s",
                     u64TSC, u64TSC, TMCpuTicksPerSecond(pVM),
                     pVM->tm.s.fTSCTicking ? "ticking" : "paused",
@@ -1867 +1878 @@
     pHlp->pfnPrintf(pHlp, "\n");
 
-    /* 
-     * virtual 
+    /*
+     * virtual
      */
     pHlp->pfnPrintf(pHlp,
@@ -1878 +1889 @@
     pHlp->pfnPrintf(pHlp, "\n");
 
-    /* 
-     * virtual sync 
+    /*
+     * virtual sync
      */
     pHlp->pfnPrintf(pHlp,
                     "VirtSync: %18RU64 (%#016RX64) %s%s",
-                    u64VirtualSync, u64VirtualSync, 
+                    u64VirtualSync, u64VirtualSync,
                     pVM->tm.s.fVirtualSyncTicking ? "ticking" : "paused",
                     pVM->tm.s.fVirtualSyncCatchUp ? " - catchup" : "");
@@ -1894 +1905 @@
     pHlp->pfnPrintf(pHlp, "\n");
 
-    /* 
-     * real 
+    /*
+     * real
      */
     pHlp->pfnPrintf(pHlp,

trunk/src/VBox/VMM/TMInternal.h

@@ -291 +291 @@
     /** CPU timestamp ticking enabled indicator (bool). (RDTSC) */
     bool                        fTSCTicking;
-    /** Set if we fully virtualize the TSC, i.e. intercept all rdtsc instructions. 
+    /** Set if we fully virtualize the TSC, i.e. intercept all rdtsc instructions.
      * Config variable: TSCVirtualized (bool) */
     bool                        fTSCVirtualized;
     /** Set if we use the real TSC as time source or if we use the virtual clock.
-     * If fTSCVirtualized is set we maintain a offset to the TSC and pausing/resuming the 
-     * ticking. fTSCVirtualized = false implies fTSCUseRealTSC = true. 
+     * If fTSCVirtualized is set we maintain a offset to the TSC and pausing/resuming the
+     * ticking. fTSCVirtualized = false implies fTSCUseRealTSC = true.
      * Config variable: TSCUseRealTSC (bool) */
     bool                        fTSCUseRealTSC;
@@ -304 +304 @@
     /** The guest TSC when fTicking is cleared. */
     uint64_t                    u64TSC;
-    /** The number of CPU clock ticks per second (TMCLOCK_TSC). 
+    /** The number of CPU clock ticks per second (TMCLOCK_TSC).
      * Config variable: TSCTicksPerSecond (64-bit unsigned int)
      * The config variable implies fTSCVirtualized = true and fTSCUseRealTSC = false. */
@@ -317 +317 @@
     /** Virtual timer synchronous time catch-up active. */
     bool volatile               fVirtualSyncCatchUp;
-    /** WarpDrive percentage. 
-     * 100% is normal (fVirtualSyncNormal == true). When other than 100% we apply 
-     * this percentage to the raw time source for the period it's been valid in, 
+    /** WarpDrive percentage.
+     * 100% is normal (fVirtualSyncNormal == true). When other than 100% we apply
+     * this percentage to the raw time source for the period it's been valid in,
      * i.e. since u64VirtualWarpDriveStart. */
     uint32_t                    u32VirtualWarpDrivePercentage;
@@ -335 +335 @@
     uint64_t volatile           u64VirtualSync;
     /** The offset of the timer synchronous virtual clock (TMCLOCK_VIRTUAL_SYNC) relative
-     * to the virtual clock (TMCLOCK_VIRTUAL). 
+     * to the virtual clock (TMCLOCK_VIRTUAL).
      * (This is accessed by the timer thread and must be updated atomically.) */
     uint64_t volatile           offVirtualSync;
-    /** The offset into offVirtualSync that's been irrevocably given up by failed catch-up attempts. 
+    /** The offset into offVirtualSync that's been irrevocably given up by failed catch-up attempts.
      * Thus the current lag is offVirtualSync - offVirtualSyncGivenUp. */
     uint64_t                    offVirtualSyncGivenUp;
@@ -351 +351 @@
     /** When to give up catch-up. */
     uint64_t                    u64VirtualSyncCatchUpGiveUpThreshold;
-/** @def TM_MAX_CATCHUP_PERIODS 
+/** @def TM_MAX_CATCHUP_PERIODS
  * The number of catchup rates. */
 #define TM_MAX_CATCHUP_PERIODS  10
-    /** The agressivness of the catch-up relative to how far we've lagged behind. 
+    /** The agressivness of the catch-up relative to how far we've lagged behind.
      * The idea is to have increasing catch-up percentage as the lag increases. */
     struct TMCATCHUPPERIOD
@@ -363 +363 @@
     }                           aVirtualSyncCatchUpPeriods[TM_MAX_CATCHUP_PERIODS];
 
+    /** The UCT offset in ns.
+     * This is *NOT* for converting UTC to local time. It is for converting real
+     * world UCT time to VM UCT time. This feature is indented for doing date
+     * testing of software and similar.
+     * @todo Implement warpdrive on UCT. */
+    int64_t                     offUCT;
+
     /** Timer queues for the different clock types - R3 Ptr */
     R3PTRTYPE(PTMTIMERQUEUE)    paTimerQueuesR3;
@@ -412 +419 @@
     STAMCOUNTER                 StatPostponedGC;
     /** @} */
-    /** Read the time 
+    /** Read the time
      * @{ */
     STAMCOUNTER                 StatVirtualGet;

trunk/src/VBox/VMM/VMMAll/TMAllVirtual.cpp

@@ -50 +50 @@
 /**
  * Get the time when we're not running at 100%
- * 
+ *
  * @returns The timestamp.
  * @param   pVM     The VM handle.
@@ -56 +56 @@
 static uint64_t tmVirtualGetRawNonNormal(PVM pVM)
 {
-    /* 
-     * Recalculate the RTTimeNanoTS() value for the period where 
+    /*
+     * Recalculate the RTTimeNanoTS() value for the period where
      * warp drive has been enabled.
      */
@@ -66 +66 @@
     u64 += pVM->tm.s.u64VirtualWarpDriveStart;
 
-    /* 
-     * Now we apply the virtual time offset. 
-     * (Which is the negate RTTimeNanoTS() value for when the virtual machine 
+    /*
+     * Now we apply the virtual time offset.
+     * (Which is the negate RTTimeNanoTS() value for when the virtual machine
      * started if it had been running continuously without any suspends.)
      */
@@ -78 +78 @@
 /**
  * Get the raw virtual time.
- * 
- * @returns The current time stamp. 
+ *
+ * @returns The current time stamp.
  * @param   pVM     The VM handle.
  */
@@ -300 +300 @@
 /**
  * Gets the current lag of the synchronous virtual clock (relative to the virtual clock).
- * 
+ *
  * @return  The current lag.
  * @param   pVM     VM handle.
@@ -312 +312 @@
 /**
  * Get the current catch-up percent.
- * 
+ *
  * @return  The current catch0up percent. 0 means running at the same speed as the virtual clock.
  * @param   pVM     VM handle.
@@ -385 +385 @@
 /**
  * Gets the current warp drive percent.
- * 
+ *
  * @returns The warp drive percent.
  * @param   pVM         The VM handle.
@@ -397 +397 @@
 /**
  * Sets the warp drive percent of the virtual time.
- * 
+ *
  * @returns VBox status code.
  * @param   pVM         The VM handle.
@@ -404 +404 @@
 TMDECL(int) TMVirtualSetWarpDrive(PVM pVM, uint32_t u32Percent)
 {
+/** @todo This isn't a feature specific to virtual time, move to TM level. (It
+ * should affect the TMR3UCTNow as well! */
 #ifdef IN_RING3
     PVMREQ pReq;
@@ -414 +416 @@
 
     return tmVirtualSetWarpDrive(pVM, u32Percent);
-#endif 
+#endif
 }
 
@@ -420 +422 @@
 /**
  * EMT worker for tmVirtualSetWarpDrive.
- * 
+ *
  * @returns VBox status code.
  * @param   pVM         The VM handle.
@@ -431 +433 @@
      * Validate it.
      */
-    AssertMsgReturn(u32Percent >= 2 && u32Percent <= 20000, 
-                    ("%RX32 is not between 2 and 20000 (inclusive).\n", u32Percent), 
+    AssertMsgReturn(u32Percent >= 2 && u32Percent <= 20000,
+                    ("%RX32 is not between 2 and 20000 (inclusive).\n", u32Percent),
                     VERR_INVALID_PARAMETER);
 
-    /* 
+    /*
      * If the time is running we'll have to pause it before we can change
      * the warp drive settings.
@@ -450 +452 @@
     pVM->tm.s.u32VirtualWarpDrivePercentage = u32Percent;
     pVM->tm.s.fVirtualWarpDrive = u32Percent != 100;
-    LogRel(("TM: u32VirtualWarpDrivePercentage=%RI32 fVirtualWarpDrive=%RTbool\n", 
+    LogRel(("TM: u32VirtualWarpDrivePercentage=%RI32 fVirtualWarpDrive=%RTbool\n",
             pVM->tm.s.u32VirtualWarpDrivePercentage, pVM->tm.s.fVirtualWarpDrive));