Changeset 78985 in vbox for trunk/src/VBox/VMM/VMMR3/EM.cpp

Timestamp:

Jun 5, 2019 9:10:37 AM (6 years ago)

Author:

vboxsync

Message:

VMM/EM: Nested VMX: bugref:9180 build fix.

File:

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

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

@@ -2171 +2171 @@
             if (fGif)
             {
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
                 /*
                  * VMX NMI-window VM-exit.
@@ -2191 +2192 @@
                     UPDATE_RC();
                 }
+                else
+#endif
                 /*
                  * NMIs (take priority over external interrupts).
                  */
-                else if (    VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NMI)
-                         && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
+                if (    VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INTERRUPT_NMI)
+                    && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_BLOCK_NMIS))
                 {
                     if (!CPUMIsGuestInNestedHwvirtMode(&pVCpu->cpum.GstCtx))