Changeset 47089 in vbox

Timestamp:

Jul 11, 2013 11:29:17 AM (12 years ago)

Author:

vboxsync

Message:

VMM/HM: Additional HM error code for certain gurus. Later use it for Intel as well and unify with 'lasterror'.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMSVMR0.cpp (modified) (3 diffs)
• VMMR3/HM.cpp (modified) (1 diff)
• include/EMHandleRCTmpl.h (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

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

@@ -3050 +3050 @@
                         default:
                             AssertMsgFailed(("hmR0SvmHandleExit: Unexpected exit caused by exception %#x\n", Event.n.u8Vector));
+                            pVCpu->hm.s.u32HMError = Event.n.u8Vector;
                             return VERR_SVM_UNEXPECTED_XCPT_EXIT;
                     }
@@ -3062 +3063 @@
                 {
                     AssertMsgFailed(("hmR0SvmHandleExit: Unknown exit code %#x\n", u32ExitCode));
+                    pVCpu->hm.s.u32HMError = u32ExitCode;
                     return VERR_SVM_UNKNOWN_EXIT;
                 }
@@ -3347 +3349 @@
 
             default:
-                AssertMsgFailedReturn(("Unexpected patch type %d\n", pPatch->enmType), VERR_SVM_UNEXPECTED_PATCH_TYPE);
-                break;
+                AssertMsgFailed(("Unexpected patch type %d\n", pPatch->enmType));
+                pVCpu->hm.s.u32HMError = pPatch->enmType;
+                return VERR_SVM_UNEXPECTED_PATCH_TYPE;
         }
     }

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

@@ -2974 +2974 @@
             case VERR_VMX_INVALID_VMXON_PTR:
                 break;
+
+            case VERR_SVM_UNKNOWN_EXIT:
+            case VERR_SVM_UNEXPECTED_EXIT:
+            case VERR_SVM_UNEXPECTED_PATCH_TYPE:
+            case VERR_SVM_UNEXPECTED_XCPT_EXIT:
+                LogRel(("HM: CPU%d HM error          %#x\n", i, pVM->aCpus[i].hm.s.u32HMError));
+                break;
         }
     }

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

@@ -347 +347 @@
         case VERR_VMX_INVALID_GUEST_STATE:
         case VERR_VMX_UNABLE_TO_START_VM:
+        case VERR_SVM_UNKNOWN_EXIT:
+        case VERR_SVM_UNEXPECTED_EXIT:
+        case VERR_SVM_UNEXPECTED_PATCH_TYPE:
+        case VERR_SVM_UNEXPECTED_XCPT_EXIT:
             HMR3CheckError(pVM, rc);
             break;

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

@@ -544 +544 @@
     /** HM_CHANGED_* flags. */
     uint32_t                    fContextUseFlags;
-    /** Id of the last cpu we were executing code on (NIL_RTCPUID for the first time) */
+    /** Id of the last cpu we were executing code on (NIL_RTCPUID for the first
+     *  time). */
     RTCPUID                     idLastCpu;
-    /** TLB flush count */
+    /** TLB flush count. */
     uint32_t                    cTlbFlushes;
-    /** Current ASID in use by the VM */
+    /** Current ASID in use by the VM. */
     uint32_t                    uCurrentAsid;
-    uint32_t                    u32Alignment;
+    /** An additional error code used for some gurus. */
+    uint32_t                    u32HMError;
 
     /** Host's TSC_AUX MSR (used when RDTSCP doesn't cause VM-exits). */