Changeset 52659 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

Timestamp:

Sep 9, 2014 5:22:26 PM (10 years ago)

Author:

vboxsync

Message:

VMM/IEM: Reset TRPM only when IEM successfully injects the trap. Regression exposed by r95968.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -10952 +10952 @@
         return rc;
 
-    TRPMResetTrap(pVCpu);
-    return IEMInjectTrap(pVCpu, u8TrapNo, enmType, uErrCode, uCr2, cbInstr);
+    VBOXSTRICTRC rcStrict = IEMInjectTrap(pVCpu, u8TrapNo, enmType, uErrCode, uCr2, cbInstr);
+    if (rcStrict == VINF_SUCCESS)
+        TRPMResetTrap(pVCpu);
+    return rcStrict;
 #endif
 }