Changeset 78645 in vbox for trunk/src/VBox

Timestamp:

May 22, 2019 6:24:59 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXAll: Nested VMX: bugref:9180 Adjust HM VM-exit notify.

File:

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

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

@@ -1237 +1237 @@
     NOREF(pCtx);
 
+    /* There shouldn't be any externally kept state at this point. */
+    AssertMsg(!(pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_ALL),
+              ("fExtrn=%#RX64 fExtrnMbz=%#RX64\n", pVCpu->cpum.GstCtx.fExtrn, CPUMCTX_EXTRN_ALL));
+
     /*
-     * Make sure we need to merge the nested-guest VMCS on next nested-guest
-     * VM entry (if we VM-exit in ring-0 and continue in ring-0 till the next
-     * nested-guest VM-entry).
+     * Make sure we need to merge the guest VMCS controls with the nested-guest
+     * VMCS controls on the next nested-guest VM entry.
      */
     pVCpu->hm.s.vmx.fMergedNstGstCtls = false;
-
-    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);
-
-
 }
 # endif /* VBOX_WITH_NESTED_HWVIRT_VMX */