Changeset 54845 in vbox

Timestamp:

Mar 19, 2015 10:55:06 AM (10 years ago)

Author:

vboxsync

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

99049

Message:

VMM/GIM,TM: paranoia assertions.

Location:

trunk

Files:

• include/VBox/vmm/tm.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/TMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/TMAllCpu.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/GIMKvm.cpp (modified) (1 diff)

trunk/include/VBox/vmm/tm.h

@@ -125 +125 @@
 VMM_INT_DECL(uint64_t)  TMVirtualFromMicro(PVM pVM, uint64_t u64MicroTS);
 VMM_INT_DECL(uint64_t)  TMVirtualFromMilli(PVM pVM, uint64_t u64MilliTS);
+VMM_INT_DECL(bool)      TMVirtualIsTicking(PVM pVM);
 /** @} */
 
@@ -139 +140 @@
 VMM_INT_DECL(uint64_t)  TMCpuTickGetLastSeen(PVMCPU pVCpu);
 VMMDECL(uint64_t)       TMCpuTicksPerSecond(PVM pVM);
+VMM_INT_DECL(bool)      TMCpuTickIsTicking(PVMCPU pVCpu);
 /** @} */
 
@@ -240 +242 @@
 VMM_INT_DECL(void)      TMTimerPollVoid(PVM pVM, PVMCPU pVCpu);
 VMM_INT_DECL(uint64_t)  TMTimerPollGIP(PVM pVM, PVMCPU pVCpu, uint64_t *pu64Delta);
-
 /** @} */
 

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

@@ -2576 +2576 @@
 }
 
+
+/**
+ * Whether the guest virtual clock is ticking.
+ *
+ * @returns true if ticking, false otherwise.
+ * @param   pVM     Pointer to the VM.
+ */
+VMM_INT_DECL(bool) TMVirtualIsTicking(PVM pVM)
+{
+    return RT_BOOL(pVM->tm.s.cVirtualTicking);
+}
+

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

@@ -543 +543 @@
 }
 
+
+/**
+ * Whether the TSC is ticking for the VCPU.
+ *
+ * @returns true if ticking, false otherwise.
+ * @param   pVCpu           Pointer to the VMCPU.
+ */
+VMM_INT_DECL(bool) TMCpuTickIsTicking(PVMCPU pVCpu)
+{
+    return pVCpu->tm.s.fTSCTicking;
+}
+

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

@@ -317 +317 @@
         if (MSR_GIM_KVM_SYSTEM_TIME_IS_ENABLED(pKvmCpu->u64SystemTimeMsr))
         {
+            Assert(!TMVirtualIsTicking(pVM));       /* paranoia. */
+            Assert(!TMCpuTickIsTicking(pVCpu));
             rc = gimR3KvmEnableSystemTime(pVM, pVCpu, pKvmCpu, fSystemTimeFlags);
             AssertRCReturn(rc, rc);