Changeset 56678 in vbox for trunk/src/VBox

Timestamp:

Jun 29, 2015 5:55:51 PM (9 years ago)

Author:

vboxsync

Message:

VMM/GIM: Update the cached TSC frequency on state-load in KVM paravirt. VMs.

File:

• trunk/src/VBox/VMM/VMMR3/GIMKvm.cpp (modified) (5 diffs)

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

@@ -175 +175 @@
         pKvm->fTrapXcptUD = true;
 
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Initializes remaining bits of the KVM provider.
+ *
+ * This is called after initializing HM and almost all other VMM components.
+ *
+ * @returns VBox status code.
+ * @param   pVM     Pointer to the VM.
+ */
+VMMR3_INT_DECL(int) gimR3KvmInitCompleted(PVM pVM)
+{
+    PGIMKVM pKvm = &pVM->gim.s.u.Kvm;
     pKvm->cTscTicksPerSecond = TMCpuTicksPerSecond(pVM);
-    return VINF_SUCCESS;
-}
-
-
-/**
- * Initializes remaining bits of the KVM provider.
- *
- * This is called after initializing HM and almost all other VMM components.
- *
- * @returns VBox status code.
- * @param   pVM     Pointer to the VM.
- */
-VMMR3_INT_DECL(int) gimR3KvmInitCompleted(PVM pVM)
-{
     if (TMR3CpuTickIsFixedRateMonotonic(pVM, true /* fWithParavirtEnabled */))
     {
@@ -196 +197 @@
          *        translated as a "monotonic" bit which even in Async systems we
          *        -should- be reporting a strictly monotonic TSC to the guest.  */
-        PGIMKVM pKvm = &pVM->gim.s.u.Kvm;
         pKvm->uBaseFeat |= GIM_KVM_BASE_FEAT_TSC_STABLE;
 
@@ -209 +209 @@
         AssertLogRelRCReturn(rc, rc);
     }
-
     return VINF_SUCCESS;
 }
@@ -339 +338 @@
 
     /*
+     * Update the TSC frequency from TM.
+     */
+    PGIMKVM pKvm = &pVM->gim.s.u.Kvm;
+    pKvm->cTscTicksPerSecond = TMCpuTicksPerSecond(pVM);
+
+    /*
      * Load per-VCPU data.
      */
@@ -368 +373 @@
      * Load per-VM data.
      */
-    PGIMKVM pKvm = &pVM->gim.s.u.Kvm;
     SSMR3GetU64(pSSM, &pKvm->u64WallClockMsr);
     rc = SSMR3GetU32(pSSM, &pKvm->uBaseFeat);