儲存庫 vbox 的更動 12079

時間撮記:

2008-9-4 上午09:35:39 (16 年 以前)

作者:

vboxsync

訊息:

More specific error messages for unexpected VT-x failures.

位置:

trunk

檔案:

• include/VBox/err.h (修改) (1 筆差異)
• src/VBox/VMM/EM.cpp (修改) (1 筆差異)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (修改) (4 筆差異)

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));
-                rc = VERR_EM_INTERNAL_ERROR;
+                rc = VERR_VMX_UNEXPECTED_EXCEPTION;
                 break;
             } /* switch (vector) */
@@ -1759 +1759 @@
 
         default:
-            rc = VERR_EM_INTERNAL_ERROR;
+            rc = VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE;
             AssertFailed();
             break;
@@ -2208 +2208 @@
         Log(("VMX_VMCS_GUEST_IDTR_BASE    %VGv\n", val));
 #endif /* VBOX_STRICT */
-        rc = VERR_EM_INTERNAL_ERROR;
+        rc = VERR_VMX_INVALID_GUEST_STATE;
         break;
     }
@@ -2215 +2215 @@
     case VMX_EXIT_ERR_MACHINE_CHECK:    /* 41 VM-entry failure due to machine-check. */
     default:
-        rc = VERR_EM_INTERNAL_ERROR;
+        rc = VERR_VMX_UNEXPECTED_EXIT_CODE;
         AssertMsgFailed(("Unexpected exit code %d\n", exitReason));                 /* Can't happen. */
         break;