Changeset 57051 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

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

101772

Message:

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

Location:

trunk/include

Files:

• VBox/err.h (modified) (2 diffs)
• iprt/x86.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -2018 +2018 @@
 #define VERR_VMX_IPE_5                              (-4027)
 /** VT-x features for all modes (SMX and non-SMX) disabled by the BIOS. */
-#define VERR_VMX_MSR_ALL_VMXON_DISABLED             (-4028)
+#define VERR_VMX_MSR_ALL_VMX_DISABLED               (-4028)
 /** VT-x features disabled by the BIOS. */
-#define VERR_VMX_MSR_VMXON_DISABLED                 (-4029)
+#define VERR_VMX_MSR_VMX_DISABLED                   (-4029)
 /** VM-Entry Controls internal cache invalid. */
 #define VERR_VMX_ENTRY_CTLS_CACHE_INVALID           (-4030)
@@ -2033 +2033 @@
  *  cache invalid. */
 #define VERR_VMX_PROC_EXEC2_CTLS_CACHE_INVALID      (-4034)
+/** Failed to enable VMX bit while enabling through the MSR. */
+#define VERR_VMX_MSR_VMX_ENABLE_FAILED              (-4035)
+/** Failed to enable VMX-in-SMX bit while enabling through the MSR. */
+#define VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED          (-4036)
 /** @} */
 

trunk/include/iprt/x86.h

@@ -1058 +1058 @@
 #define MSR_IA32_FEATURE_CONTROL            0x3A
 #define MSR_IA32_FEATURE_CONTROL_LOCK       RT_BIT(0)
-#define MSR_IA32_FEATURE_CONTROL_SMX_VMXON  RT_BIT(1)
-#define MSR_IA32_FEATURE_CONTROL_VMXON      RT_BIT(2)
+#define MSR_IA32_FEATURE_CONTROL_SMX_VMX    RT_BIT(1)
+#define MSR_IA32_FEATURE_CONTROL_VMX        RT_BIT(2)
 
 /** Per-processor TSC adjust MSR. */