Changeset 92521 in vbox

Timestamp:

Nov 20, 2021 2:21:32 AM (3 years ago)

Author:

vboxsync

Message:

VMM/TRPMR3InjectEvent: Only windows want's to use IEM to inject interrupts, so make it an opt-out of the TRPMAssertTrap behaviour instead of a NEM default. bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/TRPM.cpp (modified) (2 diffs)

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

@@ -382 +382 @@
         }
 #endif
+#ifdef RT_OS_WINDOWS
         if (!VM_IS_NEM_ENABLED(pVM))
         {
+#endif
             rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
             AssertRC(rc);
+#ifdef RT_OS_WINDOWS
         }
         else
         {
-#ifdef RT_OS_DARWIN
-            /** @todo Can this be done prettier? NEM on darwin shares the R0 VMX code which relies on the same behavior as in the non NEM case. */
-            rc = TRPMAssertTrap(pVCpu, u8Interrupt, TRPM_HARDWARE_INT);
-            AssertRC(rc);
-#else
             VBOXSTRICTRC rcStrict = IEMInjectTrap(pVCpu, u8Interrupt, enmEvent, 0, 0, 0);
             /** @todo NSTVMX: NSTSVM: We don't support nested VMX or nested SVM with NEM yet.
@@ -399 +397 @@
             if (rcStrict != VINF_SUCCESS)
                 return VBOXSTRICTRC_TODO(rcStrict);
+        }
 #endif
-        }
         STAM_REL_COUNTER_INC(&pVM->trpm.s.aStatForwardedIRQ[u8Interrupt]);
     }