Changeset 51959 in vbox

Timestamp:

Jul 9, 2014 3:18:00 PM (10 years ago)

Author:

vboxsync

Message:

TM: Set pVM->tm.s.u64LastPausedTSC to the highest pVCpu->tm.s.u64TSC value on saved state restore. Cleanups.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/TMAllCpu.cpp (modified) (3 diffs)
• VMMR3/TM.cpp (modified) (3 diffs)
• include/TMInternal.h (modified) (2 diffs)

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

@@ -80 +80 @@
 }
 
+
 /**
  * Resumes the CPU timestamp counter ticking.
@@ -144 +145 @@
 }
 
+
 /**
  * Pauses the CPU timestamp counter ticking.
@@ -172 +174 @@
     return VERR_TM_TSC_ALREADY_PAUSED;
 }
+
 
 /**

trunk/src/VBox/VMM/VMMR3/TM.cpp

@@ -1224 +1224 @@
      */
     pVM->tm.s.cVirtualTicking = 0;
-    pVM->tm.s.cTSCsTicking    = 0;
     /* the virtual clock. */
     uint64_t u64Hz;
@@ -1266 +1265 @@
 
     /* the cpu tick clock. */
+    pVM->tm.s.cTSCsTicking = 0;
+    pVM->tm.s.offTSCPause = 0;
+    pVM->tm.s.u64LastPausedTSC = 0;
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
     {
@@ -1272 +1274 @@
         pVCpu->tm.s.fTSCTicking = false;
         SSMR3GetU64(pSSM, &pVCpu->tm.s.u64TSC);
+        if (pVM->tm.s.u64LastPausedTSC < pVCpu->tm.s.u64TSC)
+            pVM->tm.s.u64LastPausedTSC = pVCpu->tm.s.u64TSC;
 
         if (pVM->tm.s.fTSCUseRealTSC)

trunk/src/VBox/VMM/include/TMInternal.h

@@ -354 +354 @@
     /** The ID of the virtual CPU that normally runs the timers. */
     VMCPUID                     idTimerCpu;
+
     /** 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. */
     uint64_t                    cTSCTicksPerSecond;
+    /** The TSC difference introduced by pausing the VM. */
+    uint64_t                    offTSCPause;
+    /** The TSC value when the last TSC was paused. */
+    uint64_t                    u64LastPausedTSC;
+    /** CPU TSCs ticking indicator (one for each VCPU). */
+    uint32_t volatile           cTSCsTicking;
 
     /** Virtual time ticking enabled indicator (counter for each VCPU). (TMCLOCK_VIRTUAL) */
@@ -373 +380 @@
      * i.e. since u64VirtualWarpDriveStart. */
     uint32_t                    u32VirtualWarpDrivePercentage;
-
-    /** CPU TSCs ticking indicator (one for each VCPU). */
-    uint32_t volatile           cTSCsTicking;
-
-    /** The TSC difference introduced by pausing the VM. */
-    uint64_t                    offTSCPause;
-
-    /** The TSC value when the last TSC was paused. */
-    uint64_t                    u64LastPausedTSC;
 
     /** The offset of the virtual clock relative to it's timesource.