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

Timestamp:

Jul 28, 2016 9:11:13 PM (8 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/GIMHv.cpp (modified) (12 diffs)

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

@@ -180 +180 @@
 static void   gimR3HvTermHypercallSupport(PVM pVM);
 static int    gimR3HvInitDebugSupport(PVM pVM);
+#if 0 /** @todo currently unused, which is probably very wrong */
 static void   gimR3HvTermDebugSupport(PVM pVM);
+#endif
 
 
@@ -319 +321 @@
     Assert((pHv->uBaseFeat & (GIM_HV_BASE_FEAT_HYPERCALL_MSRS | GIM_HV_BASE_FEAT_VP_ID_MSR))
                           == (GIM_HV_BASE_FEAT_HYPERCALL_MSRS | GIM_HV_BASE_FEAT_VP_ID_MSR));
+#ifdef VBOX_STRICT
     for (unsigned i = 0; i < RT_ELEMENTS(pHv->aMmio2Regions); i++)
     {
-        PCGIMMMIO2REGION pcCur = &pHv->aMmio2Regions[i];
-        Assert(!pcCur->fRCMapping);
-        Assert(!pcCur->fMapped);
-        Assert(pcCur->GCPhysPage == NIL_RTGCPHYS);
-    }
+        PCGIMMMIO2REGION pCur = &pHv->aMmio2Regions[i];
+        Assert(!pCur->fRCMapping);
+        Assert(!pCur->fMapped);
+        Assert(pCur->GCPhysPage == NIL_RTGCPHYS);
+    }
+#endif
 
     /*
@@ -660 +664 @@
  * @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) gimR3HvSave(PVM pVM, PSSMHANDLE pSSM)
 {
-    PCGIMHV pcHv = &pVM->gim.s.u.Hv;
+    PCGIMHV pHv = &pVM->gim.s.u.Hv;
 
     /*
@@ -674 +678 @@
      * Save per-VM MSRs.
      */
-    SSMR3PutU64(pSSM, pcHv->u64GuestOsIdMsr);
-    SSMR3PutU64(pSSM, pcHv->u64HypercallMsr);
-    SSMR3PutU64(pSSM, pcHv->u64TscPageMsr);
+    SSMR3PutU64(pSSM, pHv->u64GuestOsIdMsr);
+    SSMR3PutU64(pSSM, pHv->u64HypercallMsr);
+    SSMR3PutU64(pSSM, pHv->u64TscPageMsr);
 
     /*
      * Save Hyper-V features / capabilities.
      */
-    SSMR3PutU32(pSSM, pcHv->uBaseFeat);
-    SSMR3PutU32(pSSM, pcHv->uPartFlags);
-    SSMR3PutU32(pSSM, pcHv->uPowMgmtFeat);
-    SSMR3PutU32(pSSM, pcHv->uMiscFeat);
-    SSMR3PutU32(pSSM, pcHv->uHyperHints);
-    SSMR3PutU32(pSSM, pcHv->uHyperCaps);
+    SSMR3PutU32(pSSM, pHv->uBaseFeat);
+    SSMR3PutU32(pSSM, pHv->uPartFlags);
+    SSMR3PutU32(pSSM, pHv->uPowMgmtFeat);
+    SSMR3PutU32(pSSM, pHv->uMiscFeat);
+    SSMR3PutU32(pSSM, pHv->uHyperHints);
+    SSMR3PutU32(pSSM, pHv->uHyperCaps);
 
     /*
      * Save the Hypercall region.
      */
-    PCGIMMMIO2REGION pcRegion = &pcHv->aMmio2Regions[GIM_HV_HYPERCALL_PAGE_REGION_IDX];
-    SSMR3PutU8(pSSM,     pcRegion->iRegion);
-    SSMR3PutBool(pSSM,   pcRegion->fRCMapping);
-    SSMR3PutU32(pSSM,    pcRegion->cbRegion);
-    SSMR3PutGCPhys(pSSM, pcRegion->GCPhysPage);
-    SSMR3PutStrZ(pSSM,   pcRegion->szDescription);
+    PCGIMMMIO2REGION pRegion = &pHv->aMmio2Regions[GIM_HV_HYPERCALL_PAGE_REGION_IDX];
+    SSMR3PutU8(pSSM,     pRegion->iRegion);
+    SSMR3PutBool(pSSM,   pRegion->fRCMapping);
+    SSMR3PutU32(pSSM,    pRegion->cbRegion);
+    SSMR3PutGCPhys(pSSM, pRegion->GCPhysPage);
+    SSMR3PutStrZ(pSSM,   pRegion->szDescription);
 
     /*
      * Save the reference TSC region.
      */
-    pcRegion = &pcHv->aMmio2Regions[GIM_HV_REF_TSC_PAGE_REGION_IDX];
-    SSMR3PutU8(pSSM,     pcRegion->iRegion);
-    SSMR3PutBool(pSSM,   pcRegion->fRCMapping);
-    SSMR3PutU32(pSSM,    pcRegion->cbRegion);
-    SSMR3PutGCPhys(pSSM, pcRegion->GCPhysPage);
-    SSMR3PutStrZ(pSSM,   pcRegion->szDescription);
+    pRegion = &pHv->aMmio2Regions[GIM_HV_REF_TSC_PAGE_REGION_IDX];
+    SSMR3PutU8(pSSM,     pRegion->iRegion);
+    SSMR3PutBool(pSSM,   pRegion->fRCMapping);
+    SSMR3PutU32(pSSM,    pRegion->cbRegion);
+    SSMR3PutGCPhys(pSSM, pRegion->GCPhysPage);
+    SSMR3PutStrZ(pSSM,   pRegion->szDescription);
     /* Save the TSC sequence so we can bump it on restore (as the CPU frequency/offset may change). */
     uint32_t uTscSequence = 0;
-    if (   pcRegion->fMapped
-        && MSR_GIM_HV_REF_TSC_IS_ENABLED(pcHv->u64TscPageMsr))
-    {
-        PCGIMHVREFTSC pcRefTsc = (PCGIMHVREFTSC)pcRegion->pvPageR3;
-        uTscSequence = pcRefTsc->u32TscSequence;
+    if (   pRegion->fMapped
+        && MSR_GIM_HV_REF_TSC_IS_ENABLED(pHv->u64TscPageMsr))
+    {
+        PCGIMHVREFTSC pRefTsc = (PCGIMHVREFTSC)pRegion->pvPageR3;
+        uTscSequence = pRefTsc->u32TscSequence;
     }
     SSMR3PutU32(pSSM, uTscSequence);
@@ -720 +724 @@
      * Save debug support data.
      */
-    SSMR3PutU64(pSSM, pcHv->uDbgPendingBufferMsr);
-    SSMR3PutU64(pSSM, pcHv->uDbgSendBufferMsr);
-    SSMR3PutU64(pSSM, pcHv->uDbgRecvBufferMsr);
-    SSMR3PutU64(pSSM, pcHv->uDbgStatusMsr);
-    SSMR3PutU32(pSSM, pcHv->enmDbgReply);
-    SSMR3PutU32(pSSM, pcHv->uDbgBootpXId);
-    SSMR3PutU32(pSSM, pcHv->DbgGuestIp4Addr.u);
+    SSMR3PutU64(pSSM, pHv->uDbgPendingBufferMsr);
+    SSMR3PutU64(pSSM, pHv->uDbgSendBufferMsr);
+    SSMR3PutU64(pSSM, pHv->uDbgRecvBufferMsr);
+    SSMR3PutU64(pSSM, pHv->uDbgStatusMsr);
+    SSMR3PutU32(pSSM, pHv->enmDbgReply);
+    SSMR3PutU32(pSSM, pHv->uDbgBootpXId);
+    SSMR3PutU32(pSSM, pHv->DbgGuestIp4Addr.u);
 
     for (VMCPUID i = 0; i < pVM->cCpus; i++)
@@ -735 +739 @@
     }
 
-    return SSMR3PutU8(pSSM, UINT8_MAX);;
+    return SSMR3PutU8(pSSM, UINT8_MAX);
 }
 
@@ -744 +748 @@
  * @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) gimR3HvLoad(PVM pVM, PSSMHANDLE pSSM, uint32_t uSSMVersion)
+ * @param   pSSM            The saved state handle.
+ */
+VMMR3_INT_DECL(int) gimR3HvLoad(PVM pVM, PSSMHANDLE pSSM)
 {
     /*
@@ -758 +761 @@
         && uHvSavedStatVersion != GIM_HV_SAVED_STATE_VERSION_PRE_DEBUG)
         return SSMR3SetLoadError(pSSM, VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION, RT_SRC_POS,
-                                 N_("Unsupported Hyper-V saved-state version %u (current %u)!"), uHvSavedStatVersion,
-                                 GIM_HV_SAVED_STATE_VERSION);
+                                 N_("Unsupported Hyper-V saved-state version %u (current %u)!"),
+                                 uHvSavedStatVersion, GIM_HV_SAVED_STATE_VERSION);
 
     /*
@@ -1342 +1345 @@
 static int gimR3HvInitHypercallSupport(PVM pVM)
 {
-    int rc = VINF_SUCCESS;
     PGIMHV pHv = &pVM->gim.s.u.Hv;
     pHv->pbHypercallIn = (uint8_t *)RTMemAllocZ(GIM_HV_PAGE_SIZE);
@@ -1393 +1395 @@
 
 
+#if 0 /** @todo currently unused, which is probably very wrong */
 /**
  * Terminates Hyper-V guest debug support.
@@ -1407 +1410 @@
     }
 }
+#endif
 
 
@@ -1864 +1868 @@
     if (fFlags & ~GIM_HV_DEBUG_POST_OPTIONS_MASK))
         rcHv = GIM_HV_STATUS_INVALID_PARAMETER;
+#else
+    RT_NOREF1(fFlags);
 #endif
     if (cbWrite > GIM_HV_DEBUG_MAX_DATA_SIZE)