Changeset 54845 in vbox for trunk/src/VBox/VMM

Timestamp:

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

Author:

vboxsync

Message:

VMM/GIM,TM: paranoia assertions.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/TMAll.cpp (modified) (1 diff)
• VMMAll/TMAllCpu.cpp (modified) (1 diff)
• VMMR3/GIMKvm.cpp (modified) (1 diff)

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);