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

Timestamp:

Apr 12, 2018 10:15:02 AM (7 years ago)

Author:

vboxsync

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

122050

Message:

VMM/HMSVMR0: Build fix.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -2386 +2386 @@
  * @param   pVCpu           The cross context virtual CPU structure.
  * @param   pCtx            Pointer to the nested-guest-CPU context.
- * @param   pVmcbNstGst     Pointer to the nested-guest VMCB.
- */
-static void hmR0SvmMergeMsrpm(PHMGLOBALCPUINFO pHostCpu, PVMCPU pVCpu, PCPUMCTX pCtx, PSVMVMCB pVmcbNstGst)
+ */
+static void hmR0SvmMergeMsrpm(PHMGLOBALCPUINFO pHostCpu, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     uint64_t const *pu64GstMsrpm    = (uint64_t const *)pVCpu->hm.s.svm.pvMsrBitmap;
@@ -4389 +4388 @@
     else
     {
-        hmR0SvmMergeMsrpm(pHostCpu, pVCpu, pCtx, pVmcb);
-
-        /* Update the nested-guest VMCB with the newly merged MSRPM.*/
+        hmR0SvmMergeMsrpm(pHostCpu, pVCpu, pCtx);
+
+        /* Update the nested-guest VMCB with the newly merged MSRPM (clean bits updated below). */
         pVmcb->ctrl.u64MSRPMPhysAddr = pHostCpu->n.svm.HCPhysNstGstMsrpm;
         pbMsrBitmap = (uint8_t *)pHostCpu->n.svm.pvNstGstMsrpm;