28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
+++ src/app/virtualbox/src/VBox/VMM/VMMR3/TRPM.cpp
|
|
@@ -1561,6 +1561,17 @@
|
|
return HMR3IsActive(pVCpu) ? VINF_EM_RESCHEDULE_HM : VINF_EM_RESCHEDULE_REM; /* (Heed the halted state if this is changed!) */
|
|
}
|
|
#else /* !TRPM_FORWARD_TRAPS_IN_GC */
|
|
+ /* Restore behaviour as used in 4.2.24 Virtualbox. The PDMGetInterrupt call
|
|
+ * and TRPMAssertTrap call in 4.2.24 is solely performed when HM mode is
|
|
+ * active.
|
|
+ * With 4.3 the TRPMAssertTrap is also performed when running solely (as
|
|
+ * done on Genode/Virtualbox for realmode code) in the recompiler. Calling
|
|
+ * TRPMAssertTrap in this case leads to the effect, that the Irq isn't
|
|
+ * pending anymore for the recompiler and therefore it will not inject it.
|
|
+ *
|
|
+ * Restoring the original behaviour as of 4.2.24 mitigates the issue.
|
|
+ */
|
|
+ if (HMR3IsActive(pVCpu)) {
|
|
uint8_t u8Interrupt;
|
|
int rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
|
|
Log(("TRPMR3InjectEvent: u8Interrupt=%d (%#x) rc=%Rrc\n", u8Interrupt, u8Interrupt, rc));
|
|
@@ -1571,6 +1582,7 @@
|
|
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 */
|
|
}
|
|
/** @todo check if it's safe to translate the patch address to the original guest address.
|