Changeset 12079

Timestamp:

09/04/08 11:35:39 (3 months ago)

Author:

vboxsync

Message:

More specific error messages for unexpected VT-x failures.

Files:

• trunk/include/VBox/err.h (modified) (1 diff)
• trunk/src/VBox/VMM/EM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (4 diffs)

trunk/include/VBox/err.h

@@ -1214 +1214 @@
-/** VT-x features locked or unavailable in MSR. */
-#define VERR_VMX_MSR_LOCKED_OR_DISABLED             (-4013)
+/** Unable to switch due to invalid guest state. */
+#define VERR_VMX_INVALID_GUEST_STATE                (-4014)
+/** Unexpected VM exit code. */
+#define VERR_VMX_UNEXPECTED_EXIT_CODE               (-4015)
+/** Unexpected VM exception code. */
+#define VERR_VMX_UNEXPECTED_EXCEPTION               (-4016)
+/** Unexpected interruption exit code. */
+#define VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE  (-4017)
-/** @} */
-

trunk/src/VBox/VMM/EM.cpp

@@ -2293 +2293 @@
-        case VERR_VMX_INVALID_VMCS_PTR:
-        case VERR_VMX_INVALID_VMXON_PTR:
+        case VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE:
+        case VERR_VMX_UNEXPECTED_EXCEPTION:
+        case VERR_VMX_UNEXPECTED_EXIT_CODE:
+        case VERR_VMX_INVALID_GUEST_STATE:
-            HWACCMR3CheckError(pVM, rc);
-            break;

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

@@ -1752 +1752 @@
-            default:
-                AssertMsgFailed(("Unexpected vm-exit caused by exception %x\n", vector));
-EM_INTERNAL_ERROR
+VMX_UNEXPECTED_EXCEPTION
-                break;
-            } /* switch (vector) */
@@ -1759 +1759 @@
-
-        default:
-EM_INTERNAL_ERROR
+VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE
-            AssertFailed();
-            break;
@@ -2208 +2208 @@
-        Log(("VMX_VMCS_GUEST_IDTR_BASE    %VGv\n", val));
-#endif /* VBOX_STRICT */
-EM_INTERNAL_ERROR
+VMX_INVALID_GUEST_STATE
-        break;
-    }
@@ -2215 +2215 @@
-    case VMX_EXIT_ERR_MACHINE_CHECK:    /* 41 VM-entry failure due to machine-check. */
-    default:
-EM_INTERNAL_ERROR
+VMX_UNEXPECTED_EXIT_CODE
-        AssertMsgFailed(("Unexpected exit code %d\n", exitReason));                 /* Can't happen. */
-        break;