Changeset 79098 in vbox

Timestamp:

Jun 12, 2019 7:54:17 AM (6 years ago)

Author:

vboxsync

Message:

VMM/EM: Nested VMX: bugref:9180 Build fix for r131259.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -2200 +2200 @@
                     && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
                 {
+                    bool fInjectNmi = true;
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
                     if (   CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx)
@@ -2207 +2208 @@
                         Assert(rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE);
                         UPDATE_RC();
+                        fInjectNmi = false;
                     }
 #endif
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
-                    else if (   CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx)
-                             && CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_NMI))
+                    if (   CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx)
+                        && CPUMIsGuestSvmCtrlInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, SVM_CTRL_INTERCEPT_NMI))
                     {
                         rc2 = VBOXSTRICTRC_VAL(IEMExecSvmVmexit(pVCpu, SVM_EXIT_NMI, 0 /* uExitInfo1 */,  0 /* uExitInfo2 */));
@@ -2218 +2220 @@
                                   && rc2 != VINF_NO_CHANGE, ("%Rrc\n", rc2));
                         UPDATE_RC();
+                        fInjectNmi = false;
                     }
-                    else
-#endif
+#endif
+                    if (fInjectNmi)
                     {
                         rc2 = TRPMAssertTrap(pVCpu, X86_XCPT_NMI, TRPM_TRAP);