Changeset 8809 in vbox for trunk/src/VBox

Timestamp:

May 14, 2008 1:43:38 PM (17 years ago)

Author:

vboxsync

Message:

Proper injection of pending interrupts when IF=0, so they get dispatched as soon as the interrupt flag gets set.

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (3 diffs)

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

@@ -358 +358 @@
             Log2(("Enable irq window exit!\n"));
             /** @todo use virtual interrupt method to inject a pending irq; dispatched as soon as guest.IF is set. */
-////            pVMCB->ctrl.u32InterceptCtrl1 |= SVM_CTRL1_INTERCEPT_VINTR;
-////            AssertRC(rc);
+            pVMCB->ctrl.u32InterceptCtrl1 |= SVM_CTRL1_INTERCEPT_VINTR;
+            pVMCB->ctrl.IntCtrl.n.u1VIrqValid    = 1;
+            pVMCB->ctrl.IntCtrl.n.u1IgnoreTPR    = 1; /* ignore the priority in the TPR; just deliver it */
+            pVMCB->ctrl.IntCtrl.n.u8VIrqVector   = 0; /* don't care */
         }
         else
@@ -1170 +1172 @@
     }
 
+    case SVM_EXIT_VINTR:
+        /* A virtual interrupt is about to be delivered, which means IF=1. */
+        pVMCB->ctrl.IntCtrl.n.u1VIrqValid    = 0;
+        pVMCB->ctrl.IntCtrl.n.u1IgnoreTPR    = 0;
+        pVMCB->ctrl.IntCtrl.n.u8VIrqVector   = 0;
+        goto ResumeExecution;
+
     case SVM_EXIT_FERR_FREEZE:
     case SVM_EXIT_INTR:
@@ -1175 +1184 @@
     case SVM_EXIT_SMI:
     case SVM_EXIT_INIT:
-    case SVM_EXIT_VINTR:
         /* External interrupt; leave to allow it to be dispatched again. */
         rc = VINF_EM_RAW_INTERRUPT;