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

Timestamp:

Aug 14, 2017 11:37:08 AM (8 years ago)

Author:

vboxsync

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

117546

Message:

VMM/HMSVMR0: Nested Hw.virt: SVM bits.

File:

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

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

@@ -2111 +2111 @@
     STAM_PROFILE_ADV_START(&pVCpu->hm.s.StatLoadGuestState, x);
 
+    /*
+     * Load guest intercepts first into the guest VMCB as later we may merge
+     * them into the nested-guest VMCB further below.
+     */
+    {
+        PSVMVMCB pVmcb = pVCpu->hm.s.svm.pVmcb;
+        hmR0SvmLoadGuestXcptIntercepts(pVCpu, pVmcb);
+    }
+
     PSVMVMCB pVmcbNstGst = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
     Assert(pVmcbNstGst);
@@ -2131 +2140 @@
 
     hmR0SvmLoadGuestApicStateNested(pVCpu, pVmcbNstGst);
-    hmR0SvmLoadGuestXcptIntercepts(pVCpu, pVmcbNstGst);
 
     int rc = hmR0SvmSetupVMRunHandler(pVCpu);