Changeset 62641 in vbox for trunk/src/VBox/VMM/VMMR3/GIMKvm.cpp

Timestamp:

Jul 28, 2016 9:11:13 PM (9 years ago)

Author:

vboxsync

Message:

GIM: Please refrain from using 'c' as 'const', 'c' always means 'count of' and make variables like 'pcRegion' very very confusing. The compiler will tell you if you try access a const variable, don't worry. Fixed unused variable warnings/

File:

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

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

@@ -267 +267 @@
  * @returns VBox status code.
  * @param   pVM     The cross context VM structure.
- * @param   pSSM    Pointer to the SSM handle.
+ * @param   pSSM    The saved state handle.
  */
 VMMR3_INT_DECL(int) gimR3KvmSave(PVM pVM, PSSMHANDLE pSSM)
 {
-    PCGIMKVM pcKvm = &pVM->gim.s.u.Kvm;
+    PCGIMKVM pKvm = &pVM->gim.s.u.Kvm;
 
     /*
@@ -283 +283 @@
     for (uint32_t i = 0; i < pVM->cCpus; i++)
     {
-        PCGIMKVMCPU pcKvmCpu = &pVM->aCpus[i].gim.s.u.KvmCpu;
+        PCGIMKVMCPU pKvmCpu = &pVM->aCpus[i].gim.s.u.KvmCpu;
 
         /* Guest may alter flags (namely GIM_KVM_SYSTEM_TIME_FLAGS_GUEST_PAUSED bit). So re-read them from guest-memory. */
         GIMKVMSYSTEMTIME SystemTime;
         RT_ZERO(SystemTime);
-        if (MSR_GIM_KVM_SYSTEM_TIME_IS_ENABLED(pcKvmCpu->u64SystemTimeMsr))
+        if (MSR_GIM_KVM_SYSTEM_TIME_IS_ENABLED(pKvmCpu->u64SystemTimeMsr))
         {
-            int rc = PGMPhysSimpleReadGCPhys(pVM, &SystemTime, pcKvmCpu->GCPhysSystemTime, sizeof(GIMKVMSYSTEMTIME));
+            int rc = PGMPhysSimpleReadGCPhys(pVM, &SystemTime, pKvmCpu->GCPhysSystemTime, sizeof(GIMKVMSYSTEMTIME));
             AssertRCReturn(rc, rc);
         }
 
-        SSMR3PutU64(pSSM, pcKvmCpu->u64SystemTimeMsr);
-        SSMR3PutU64(pSSM, pcKvmCpu->uTsc);
-        SSMR3PutU64(pSSM, pcKvmCpu->uVirtNanoTS);
-        SSMR3PutGCPhys(pSSM, pcKvmCpu->GCPhysSystemTime);
-        SSMR3PutU32(pSSM, pcKvmCpu->u32SystemTimeVersion);
+        SSMR3PutU64(pSSM, pKvmCpu->u64SystemTimeMsr);
+        SSMR3PutU64(pSSM, pKvmCpu->uTsc);
+        SSMR3PutU64(pSSM, pKvmCpu->uVirtNanoTS);
+        SSMR3PutGCPhys(pSSM, pKvmCpu->GCPhysSystemTime);
+        SSMR3PutU32(pSSM, pKvmCpu->u32SystemTimeVersion);
         SSMR3PutU8(pSSM, SystemTime.fFlags);
     }
@@ -305 +305 @@
      * Save per-VM data.
      */
-    SSMR3PutU64(pSSM, pcKvm->u64WallClockMsr);
-    return SSMR3PutU32(pSSM, pcKvm->uBaseFeat);
+    SSMR3PutU64(pSSM, pKvm->u64WallClockMsr);
+    return SSMR3PutU32(pSSM, pKvm->uBaseFeat);
 }
 
@@ -315 +315 @@
  * @returns VBox status code.
  * @param   pVM             The cross context VM structure.
- * @param   pSSM            Pointer to the SSM handle.
- * @param   uSSMVersion     The GIM saved-state version.
- */
-VMMR3_INT_DECL(int) gimR3KvmLoad(PVM pVM, PSSMHANDLE pSSM, uint32_t uSSMVersion)
+ * @param   pSSM            The saved state handle.
+ */
+VMMR3_INT_DECL(int) gimR3KvmLoad(PVM pVM, PSSMHANDLE pSSM)
 {
     /*
@@ -328 +327 @@
     if (uKvmSavedStatVersion != GIM_KVM_SAVED_STATE_VERSION)
         return SSMR3SetLoadError(pSSM, VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION, RT_SRC_POS,
-                                 N_("Unsupported KVM saved-state version %u (expected %u)."), uKvmSavedStatVersion,
-                                 GIM_KVM_SAVED_STATE_VERSION);
+                                 N_("Unsupported KVM saved-state version %u (expected %u)."),
+                                 uKvmSavedStatVersion, GIM_KVM_SAVED_STATE_VERSION);
 
     /*
@@ -345 +344 @@
         PGIMKVMCPU pKvmCpu = &pVCpu->gim.s.u.KvmCpu;
 
-        uint8_t fSystemTimeFlags = 0;
         SSMR3GetU64(pSSM, &pKvmCpu->u64SystemTimeMsr);
         SSMR3GetU64(pSSM, &pKvmCpu->uTsc);
@@ -474 +472 @@
  *      Worker for gimR3KvmEnableWallClock}
  */
-static DECLCALLBACK(VBOXSTRICTRC) gimR3KvmEnableWallClockCallback(PVM pVM, PVMCPU pVCpu, void *pvData)
-{
-    Assert(pvData);
-    PKVMWALLCLOCKINFO pWallClockInfo  = (PKVMWALLCLOCKINFO)pvData;
+static DECLCALLBACK(VBOXSTRICTRC) gimR3KvmEnableWallClockCallback(PVM pVM, PVMCPU pVCpu, void *pvUser)
+{
+    PKVMWALLCLOCKINFO pWallClockInfo  = (PKVMWALLCLOCKINFO)pvUser; AssertPtr(pWallClockInfo);
     RTGCPHYS          GCPhysWallClock = pWallClockInfo->GCPhysWallClock;
+    RT_NOREF1(pVCpu);
 
     /*
@@ -495 +493 @@
      * Ensure the version is incrementally even.
      */
+    /* faster: uVersion = (uVersion | 1) + 1; */
     if (!(uVersion & 1))
         ++uVersion;
@@ -521 +520 @@
     rc = PGMPhysSimpleWriteGCPhys(pVM, GCPhysWallClock, &WallClock, sizeof(GIMKVMWALLCLOCK));
     if (RT_SUCCESS(rc))
-    {
         LogRel(("GIM: KVM: Enabled wall-clock struct. at %#RGp - u32Sec=%u u32Nano=%u uVersion=%#RU32\n", GCPhysWallClock,
                 WallClock.u32Sec, WallClock.u32Nano, WallClock.u32Version));
-    }
     else
         LogRel(("GIM: KVM: Failed to write wall-clock struct. at %#RGp. rc=%Rrc\n", GCPhysWallClock, rc));