Changeset 72229 in vbox

Timestamp:

May 17, 2018 9:07:22 AM (7 years ago)

Author:

vboxsync

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

122672

Message:

NEM/win: Always set HvX64RegisterDeliverabilityNotifications on exit if we're waiting to deliver an interrupt or NMI. This fixes the NT OS loader up/down hang.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (1 diff)
• VMMR0/NEMR0Native-win.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -1961 +1961 @@
         /*
          * Ensure that hyper-V has the whole state.
+         * (We always update the interrupt windows settings when active as hyper-V seems
+         * to forget about it after an exit.)
          */
         if (      (pCtx->fExtrn & (CPUMCTX_EXTRN_ALL | CPUMCTX_EXTRN_NEM_WIN_MASK))
                !=                 (CPUMCTX_EXTRN_ALL | CPUMCTX_EXTRN_NEM_WIN_MASK)
+            || pVCpu->nem.s.fDesiredInterruptWindows
             || pVCpu->nem.s.fCurrentInterruptWindows != pVCpu->nem.s.fDesiredInterruptWindows)
         {

trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

@@ -1059 +1059 @@
         Assert(!(fWhat & CPUMCTX_EXTRN_NEM_WIN_INHIBIT_NMI));
 
-    /* Interrupt windows. */
+    /* Interrupt windows. Always set if active as Hyper-V seems to be forgetful. */
     uint8_t const fDesiredIntWin = pVCpu->nem.s.fDesiredInterruptWindows;
-    if (pVCpu->nem.s.fCurrentInterruptWindows != fDesiredIntWin)
+    if (   fDesiredIntWin
+        || pVCpu->nem.s.fCurrentInterruptWindows != fDesiredIntWin)
     {
         pVCpu->nem.s.fCurrentInterruptWindows = pVCpu->nem.s.fDesiredInterruptWindows;