Changeset 96974 in vbox

Timestamp:

Oct 4, 2022 5:32:09 AM (2 years ago)

Author:

vboxsync

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

153897

Message:

VMM/VMXAllTemplate: Nested VMX: bugref:10092 Fix assertion when we fail vmlaunch/vmresume fails with an invalid-guest state.

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -5564 +5564 @@
         AssertPtr((a_pVCpu)); \
         AssertPtr((a_pVmxTransient)); \
-        Assert((a_pVmxTransient)->fVMEntryFailed == false); \
+        Assert(   (a_pVmxTransient)->fVMEntryFailed == false \
+               || (a_pVmxTransient)->uExitReason == VMX_EXIT_ERR_INVALID_GUEST_STATE \
+               || (a_pVmxTransient)->uExitReason == VMX_EXIT_ERR_MSR_LOAD \
+               || (a_pVmxTransient)->uExitReason == VMX_EXIT_ERR_MACHINE_CHECK); \
         Assert((a_pVmxTransient)->pVmcsInfo); \
         Assert(ASMIntAreEnabled()); \
@@ -5582 +5585 @@
         AssertPtr((a_pVCpu)); \
         AssertPtr((a_pVmxTransient)); \
-        Assert((a_pVmxTransient)->fVMEntryFailed == false); \
+        Assert(   (a_pVmxTransient)->fVMEntryFailed == false \
+               || (a_pVmxTransient)->uExitReason == VMX_EXIT_ERR_INVALID_GUEST_STATE \
+               || (a_pVmxTransient)->uExitReason == VMX_EXIT_ERR_MSR_LOAD \
+               || (a_pVmxTransient)->uExitReason == VMX_EXIT_ERR_MACHINE_CHECK); \
         Assert((a_pVmxTransient)->pVmcsInfo); \
         Log4Func(("vcpu[%RU32]\n", (a_pVCpu)->idCpu)); \