Changeset 71383 in vbox

Timestamp:

Mar 20, 2018 8:47:39 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Nested hw.virt: Handle NMI intercept #VMEXIT for a nested-guest while injecting an NMI into the guest.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -3458 +3458 @@
             else
             {
+                if (CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_NMI))
+                {
+                    Log4(("Intercepting NMI -> #VMEXIT\n"));
+                    return IEMExecSvmVmexit(pVCpu, SVM_EXIT_NMI, 0, 0);
+                }
+
                 Log4(("Pending NMI\n"));
-
                 SVMEVENT Event;
                 Event.u = 0;
@@ -3465 +3470 @@
                 Event.n.u8Vector = X86_XCPT_NMI;
                 Event.n.u3Type   = SVM_EVENT_NMI;
-
                 hmR0SvmSetPendingEvent(pVCpu, &Event, 0 /* GCPtrFaultAddress */);
                 hmR0SvmSetIretIntercept(pVmcbNstGst);
@@ -3503 +3507 @@
                 {
                     Log4(("Injecting external interrupt u8Interrupt=%#x\n", u8Interrupt));
-
                     SVMEVENT Event;
                     Event.u = 0;
@@ -3509 +3512 @@
                     Event.n.u8Vector = u8Interrupt;
                     Event.n.u3Type   = SVM_EVENT_EXTERNAL_IRQ;
-
                     hmR0SvmSetPendingEvent(pVCpu, &Event, 0 /* GCPtrFaultAddress */);
                 }