Changeset 60716 in vbox for trunk/src/VBox/VMM/VMMRC

Timestamp:

Apr 27, 2016 1:11:46 PM (9 years ago)

Author:

vboxsync

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

106902

Message:

VMM: Fixed TPR thresholding and related PDM interfaces.
Cleaned up the PDM interface and merged apicHasPendingIrq with apicGetTpr.
Fixed raw-mode with the new APIC code due to busted GC mapping relocation.

This finally fixes the NT4 VM boot-up issue with the new APIC code.

File:

• trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -249 +249 @@
         else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_TRPM_SYNC_IDT))
             rc = VINF_EM_RAW_TO_R3;
-        /* Pending interrupt: dispatch it. */
+        /* Possibly pending interrupt: dispatch it. */
         else if (    VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
                  && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS)
@@ -258 +258 @@
             rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
             Log(("trpmGCExitTrap: u8Interrupt=%d (%#x) rc=%Rrc\n", u8Interrupt, u8Interrupt, rc));
-            AssertFatalMsgRC(rc, ("PDMGetInterrupt failed with %Rrc\n", rc));
-            rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)u8Interrupt, 0, TRPM_TRAP_NO_ERRORCODE, TRPM_HARDWARE_INT, uOldActiveVector);
-            /* can't return if successful */
-            Assert(rc != VINF_SUCCESS);
-
-            /* Stop the profile counter that was started in TRPMGCHandlersA.asm */
-            Assert(uOldActiveVector <= 16);
-            STAM_PROFILE_ADV_STOP(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
-
-            /* Assert the trap and go to the recompiler to dispatch it. */
-            TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
-
-            STAM_PROFILE_ADV_START(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
-            rc = VINF_EM_RAW_INTERRUPT_PENDING;
+            if (RT_SUCCESS(rc))
+            {
+                rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)u8Interrupt, 0, TRPM_TRAP_NO_ERRORCODE, TRPM_HARDWARE_INT, uOldActiveVector);
+                /* can't return if successful */
+                Assert(rc != VINF_SUCCESS);
+
+                /* Stop the profile counter that was started in TRPMRCHandlersA.asm */
+                Assert(uOldActiveVector <= 16);
+                STAM_PROFILE_ADV_STOP(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
+
+                /* Assert the trap and go to the recompiler to dispatch it. */
+                TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
+
+                STAM_PROFILE_ADV_START(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
+                rc = VINF_EM_RAW_INTERRUPT_PENDING;
+            }
+            else if (   rc == VERR_APIC_INTR_MASKED_BY_TPR  /* Can happen if TPR is too high for the newly arrived interrupt. */
+                     || rc == VERR_NO_DATA)                 /* Can happen if the APIC is disabled. */
+            {
+                STAM_PROFILE_ADV_STOP(&pVM->trpm.s.aStatGCTraps[uOldActiveVector], a);
+                rc = VINF_SUCCESS;
+            }
+            else
+                AssertFatalMsgRC(rc, ("PDMGetInterrupt failed. rc=%Rrc\n", rc));
         }
         /*