Changeset 73140 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jul 16, 2018 9:06:51 AM (7 years ago)

Author:

vboxsync

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

123730

Message:

VMM/HMSVM: Sort out state syncing on #VMEXIT, VMRUN transitions. We need to swap the full state as we use dedicated VMCBs for
guest and nested-guest.

File:

• trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -164 +164 @@
      * However, with nested-guests, the state -can- change on trips to ring-3 for we might
      * try to inject a nested-guest physical interrupt and cause a SVM_EXIT_INTR #VMEXIT for
-     * the nested-guest from ring-3. Hence we signal the required CPU state change here.
+     * the nested-guest from ring-3. Import the complete state here as we will be swapping
+     * to the guest VMCB after the #VMEXIT.
      */
-    /** @todo Figure out why using HM_CHANGED_SVM_VMEXIT_MASK instead of
-     *        HM_CHANGED_ALL_GUEST breaks nested guests (XP Pro, DSL etc.), see also
-     *        hmR0SvmHandleExitNested(). */
-    AssertMsg(!(pVCpu->cpum.GstCtx.fExtrn & IEM_CPUMCTX_EXTRN_SVM_VMEXIT_MASK),
-              ("fExtrn=%#RX64 fExtrnMbz=%#RX64\n", pVCpu->cpum.GstCtx.fExtrn, IEM_CPUMCTX_EXTRN_SVM_VMEXIT_MASK));
+    CPUMImportGuestStateOnDemand(pVCpu, CPUMCTX_EXTRN_ALL);
+    AssertMsg(!(pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_ALL),
+              ("fExtrn=%#RX64 fExtrnMbz=%#RX64\n", pVCpu->cpum.GstCtx.fExtrn, CPUMCTX_EXTRN_ALL));
     ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
 }