Changeset 71914 in vbox for trunk

Timestamp:

Apr 19, 2018 9:04:03 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Build fix.

File:

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

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

@@ -2152 +2152 @@
  * @param   pVCpu           The cross context virtual CPU structure.
  * @param   pVmcbNstGst     Pointer to the nested-guest VM control block.
- * @param   pCtx            Pointer to the guest-CPU context.
- */
-static void hmR0SvmMergeVmcbCtrlsNested(PVMCPU pVCpu, PSVMVMCB pVmcbNstGst, PCPUMCTX pCtx)
+ * @param   pCtx            Pointer to the nested-guest-CPU context.
+ */
+static void hmR0SvmMergeVmcbCtrlsNested(PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     PVM          pVM             = pVCpu->CTX_SUFF(pVM);
     PCSVMVMCB    pVmcb           = pVCpu->hm.s.svm.pVmcb;
+    PSVMVMCB     pVmcbNstGst     = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
     PSVMVMCBCTRL pVmcbNstGstCtrl = &pVmcbNstGst->ctrl;
 
@@ -2531 +2532 @@
  *
  * @param   pVCpu           The cross context virtual CPU structure.
- * @param   pCtx            Pointer to the guest-CPU context.
+ * @param   pCtx            Pointer to the nested-guest-CPU context.
  */
 static void hmR0SvmVmRunSetupVmcb(PVMCPU pVCpu, PCPUMCTX pCtx)
@@ -2583 +2584 @@
 
         /* Merge the guest and nested-guest intercepts. */
-        hmR0SvmMergeVmcbCtrlsNested(pVCpu, pVmcbNstGst, pCtx);
+        hmR0SvmMergeVmcbCtrlsNested(pVCpu, pCtx);
 
         /* Update the VMCB clean bits. */
@@ -4098 +4099 @@
  * @param   pVM             The cross context VM structure.
  * @param   pVCpu           The cross context virtual CPU structure.
- * @param   pCtx            Pointer to the guest-CPU context.
+ * @param   pCtx            Pointer to the nested-guest-CPU context.
  * @param   pSvmTransient   Pointer to the SVM transient structure.
  *