Changeset 57051 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 22, 2015 9:44:48 AM (10 years ago)

Author:

vboxsync

Message:

VMM, SUPDrv: More fine-grained error codes and checking, corrected typo in a couple of existing error codes.

File:

• trunk/src/VBox/VMM/VMMR3/HM.cpp (modified) (2 diffs)

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

@@ -546 +546 @@
                     break;
 
-                case VERR_VMX_MSR_VMXON_DISABLED:
+                case VERR_VMX_MSR_VMX_DISABLED:
                     pszMsg = "VT-x is disabled in the BIOS.";
                     break;
 
-                case VERR_VMX_MSR_ALL_VMXON_DISABLED:
+                case VERR_VMX_MSR_ALL_VMX_DISABLED:
                     pszMsg = "VT-x is disabled in the BIOS for all CPU modes.";
                     break;
@@ -958 +958 @@
             case VERR_VMX_NO_VMX:
                 return VM_SET_ERROR(pVM, VERR_VMX_NO_VMX, "VT-x is not available.");
-            case VERR_VMX_MSR_VMXON_DISABLED:
-                return VM_SET_ERROR(pVM, VERR_VMX_MSR_VMXON_DISABLED, "VT-x is disabled in the BIOS.");
-            case VERR_VMX_MSR_ALL_VMXON_DISABLED:
-                return VM_SET_ERROR(pVM, VERR_VMX_MSR_ALL_VMXON_DISABLED, "VT-x is disabled in the BIOS for all CPU modes.");
+            case VERR_VMX_MSR_VMX_DISABLED:
+                return VM_SET_ERROR(pVM, VERR_VMX_MSR_VMX_DISABLED, "VT-x is disabled in the BIOS.");
+            case VERR_VMX_MSR_ALL_VMX_DISABLED:
+                return VM_SET_ERROR(pVM, VERR_VMX_MSR_ALL_VMX_DISABLED, "VT-x is disabled in the BIOS for all CPU modes.");
             case VERR_VMX_MSR_LOCKING_FAILED:
-                return VM_SET_ERROR(pVM, VERR_VMX_MSR_LOCKING_FAILED, "Failed to enable and lock VT-x features.");
+                return VM_SET_ERROR(pVM, VERR_VMX_MSR_LOCKING_FAILED, "Failed to lock VT-x features while trying to enable VT-x.");
+            case VERR_VMX_MSR_VMX_ENABLE_FAILED:
+                return VM_SET_ERROR(pVM, VERR_VMX_MSR_VMX_ENABLE_FAILED, "Failed to enable VT-x features.");
+            case VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED:
+                return VM_SET_ERROR(pVM, VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED, "Failed to enable VT-x features in SMX mode.");
 
             case VERR_SVM_IN_USE: