Changeset 51726 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 25, 2014 7:03:24 PM (11 years ago)

Author:

vboxsync

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

94511

Message:

VMM: fix TRPMR3InjectEvent() for TRPM_FORWARD_TRAPS_IN_GC disabled

File:

• trunk/src/VBox/VMM/VMMR3/TRPM.cpp (modified) (1 diff)

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

@@ -1562 +1562 @@
         }
 #else /* !TRPM_FORWARD_TRAPS_IN_GC */
-        if (HMR3IsActive(pVCpu))
+        uint8_t u8Interrupt;
+        int rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
+        Log(("TRPMR3InjectEvent: u8Interrupt=%d (%#x) rc=%Rrc\n", u8Interrupt, u8Interrupt, rc));
+        if (RT_SUCCESS(rc))
         {
-            uint8_t u8Interrupt;
-            int rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
-            Log(("TRPMR3InjectEvent: u8Interrupt=%d (%#x) rc=%Rrc\n", u8Interrupt, u8Interrupt, rc));
-            if (RT_SUCCESS(rc))
-            {
-                rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
-                AssertRC(rc);
-                STAM_COUNTER_INC(&pVM->trpm.s.paStatForwardedIRQR3[u8Interrupt]);
-                return VINF_EM_RESCHEDULE_HM;
-            }
+            rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
+            AssertRC(rc);
+            STAM_COUNTER_INC(&pVM->trpm.s.paStatForwardedIRQR3[u8Interrupt]);
+            return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM;
         }
 #endif /* !TRPM_FORWARD_TRAPS_IN_GC */