Changeset 45519 in vbox for trunk

Timestamp:

Apr 12, 2013 12:47:58 PM (12 years ago)

Author:

vboxsync

Message:

VMMR0/HMVMXR0: Inject software int from TRPM

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

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

@@ -5749 +5749 @@
 
     int rc = TRPMQueryTrapAll(pVCpu, &u8Vector, &enmTrpmEvent, &uErrCode, NULL /* puCr2 */);
-    AssertRCReturn(rc, rc);
-    Assert(enmTrpmEvent != TRPM_SOFTWARE_INT);
-
-    rc = TRPMResetTrap(pVCpu);
+    rc    |= TRPMResetTrap(pVCpu);
     AssertRCReturn(rc, rc);
 
@@ -5789 +5786 @@
     else if (enmTrpmEvent == TRPM_HARDWARE_INT)
         u32IntrInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+    else if (enmTrpmEvent == TRPM_SOFTWARE_INT)
+        u32IntrInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
     else
         AssertMsgFailed(("Invalid TRPM event type %d\n", enmTrpmEvent));