Changeset 72872 in vbox for trunk/include/VBox

Timestamp:

Jul 4, 2018 1:14:32 PM (7 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: bugref:9193 Fix a bug with our exception bitmap cache going out of sync with the VMCS value.
Added additional consistency checks for VMCS cache values (exception bitmap, TSC offset) - now reports specific
errors via u32HmError on VERR_VMX_INVALID_GUEST_STATE gurus.

Location:

trunk/include/VBox

Files:

• err.h (modified) (1 diff)
• vmm/hm_vmx.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -2096 +2096 @@
 /** VT-x features disabled by the BIOS. */
 #define VERR_VMX_MSR_VMX_DISABLED                   (-4029)
-/** VM-Entry Controls internal cache invalid. */
-#define VERR_VMX_ENTRY_CTLS_CACHE_INVALID           (-4030)
-/** VM-Exit Controls internal cache invalid. */
-#define VERR_VMX_EXIT_CTLS_CACHE_INVALID            (-4031)
-/** VM-Execution Pin-based Controls internal cache invalid. */
-#define VERR_VMX_PIN_EXEC_CTLS_CACHE_INVALID        (-4032)
-/** VM-Execution Primary Processor-based Controls internal cache
- *  invalid. */
-#define VERR_VMX_PROC_EXEC_CTLS_CACHE_INVALID       (-4033)
-/** VM-Execution Secondary Processor-based Controls internal
- *  cache invalid. */
-#define VERR_VMX_PROC_EXEC2_CTLS_CACHE_INVALID      (-4034)
+/** VT-x VMCS field cache invalid. */
+#define VERR_VMX_VMCS_FIELD_CACHE_INVALID           (-4030)
 /** Failed to set VMXON enable bit while enabling VT-x through the MSR. */
-#define VERR_VMX_MSR_VMX_ENABLE_FAILED              (-4035)
+#define VERR_VMX_MSR_VMX_ENABLE_FAILED              (-4031)
 /** Failed to enable VMXON-in-SMX bit while enabling VT-x through the MSR. */
-#define VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED          (-4036)
+#define VERR_VMX_MSR_SMX_VMX_ENABLE_FAILED          (-4032)
 /** @} */
 

trunk/include/VBox/vmm/hm_vmx.h

@@ -149 +149 @@
 /** EPT requires page-walk length of 4. */
 #define VMX_UFC_EPT_PAGE_WALK_LENGTH_UNSUPPORTED                14
+/** @} */
+
+/** @name VMX HM-error codes for VERR_VMX_VMCS_FIELD_CACHE_INVALID.
+ *  VCI = VMCS-field Cache Invalid.
+ * @{
+ */
+/** Cache of VM-entry controls invalid. */
+#define VMX_VCI_CTRL_ENTRY                                      300
+/** Cache of VM-exit controls invalid. */
+#define VMX_VCI_CTRL_EXIT                                       301
+/** Cache of pin-based VM-execution controls invalid. */
+#define VMX_VCI_CTRL_PIN_EXEC                                   302
+/** Cache of processor-based VM-execution controls invalid. */
+#define VMX_VCI_CTRL_PROC_EXEC                                  303
+/** Cache of secondary processor-based VM-execution controls invalid. */
+#define VMX_VCI_CTRL_PROC_EXEC2                                 304
+/** Cache of exception bitmap invalid. */
+#define VMX_VCI_CTRL_XCPT_BITMAP                                305
+/** Cache of TSC offset invalid. */
+#define VMX_VCI_CTRL_TSC_OFFSET                                 306
 /** @} */