Changeset 45693 in vbox

Timestamp:

Apr 24, 2013 11:32:42 AM (12 years ago)

Author:

vboxsync

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

85238

Message:

VMM: Introducing VINF_EM_TRIPLE_FAULT status code for triple-fault conditions in HM, to result in a guru meditation.

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp (modified) (1 diff)
• src/VBox/VMM/include/EMHandleRCTmpl.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -241 +241 @@
 /** Unexpected guest mapping conflict detected. */
 #define VERR_EM_UNEXPECTED_MAPPING_CONFLICT (-1154)
+/** Reason for leaving RC: A triple-fault condition. Currently, causes
+ *  a guru meditation. */
+#define VINF_EM_TRIPLE_FAULT                1155
 /** @} */
 

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

@@ -5500 +5500 @@
     }
     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));
@@ -6049 +6047 @@
  *
  * @param   pVCpu               Pointer to the VMCPU.
- * @param   pMixedCtx           Pointer to the guest-CPU context. The data may 
+ * @param   pMixedCtx           Pointer to the guest-CPU context. The data may
  *                              be out-of-sync. Make sure to update the required
  *                              fields before using them.
  * @param   u64IntrInfo         The VM-entry interruption-information field.
- * @param   cbInstr             The VM-entry instruction length in bytes (for 
+ * @param   cbInstr             The VM-entry instruction length in bytes (for
  *                              software interrupts, exceptions and privileged
  *                              software exceptions).
- * @param   u32ErrCode          The VM-entry exception error code. 
+ * @param   u32ErrCode          The VM-entry exception error code.
  * @param   GCPtrFaultAddress   The page-fault address for #PF exceptions.
  * @param   puIntrState         Pointer to the current guest interruptibility-state.
@@ -6735 +6733 @@
     if (rc == VERR_EM_INTERPRETER)
         rc = VINF_EM_RAW_EMULATE_INSTR;
+    else if (rc == VINF_EM_RESET)
+        rc = VINF_EM_TRIPLE_FAULT;
     hmR0VmxExitToRing3(pVM, pVCpu, pCtx, rc);
     return rc;

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

@@ -2246 +2246 @@
                  */
                 case VERR_VMM_RING0_ASSERTION:
+                case VINF_EM_TRIPLE_FAULT:
                     Log(("EMR3ExecuteVM: %Rrc: %d -> %d (EMSTATE_GURU_MEDITATION)\n", rc, enmOldState, EMSTATE_GURU_MEDITATION));
                     pVCpu->em.s.enmState = EMSTATE_GURU_MEDITATION;

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

@@ -289 +289 @@
         case VINF_EM_DBG_HYPER_BREAKPOINT:
         case VINF_EM_DBG_HYPER_STEPPED:
+        case VINF_EM_TRIPLE_FAULT:
         case VERR_VMM_HYPER_CR3_MISMATCH:
         {

trunk/src/VBox/VMM/include/EMHandleRCTmpl.h

@@ -328 +328 @@
         case VERR_TRPM_PANIC:
         case VERR_VMM_RING0_ASSERTION:
+        case VINF_EM_TRIPLE_FAULT:
         case VERR_VMM_HYPER_CR3_MISMATCH:
         case VERR_VMM_RING3_CALL_DISABLED: