Changeset 73311 in vbox for trunk/include/VBox

Timestamp:

Jul 23, 2018 7:29:34 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Cleanups, add new VMCS bits.

File:

• trunk/include/VBox/vmm/hm_vmx.h (modified) (32 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1038 +1038 @@
 
 
-/** @name VM Instruction Errors
+/** @name VM Instruction Errors.
  * @{
  */
@@ -1095 +1095 @@
 
 
-/** @name VMX MSRs - Basic VMX information.
+/** @name VMX MSR - Basic VMX information.
  * @{
  */
@@ -1129 +1129 @@
 
 
-/** @name VMX MSRs - Misc VMX info.
+/** @name VMX MSR - Misc VMX info.
  * @{
  */
@@ -1154 +1154 @@
 
 
-/** @name VMX MSRs - VMCS enumeration field info
+/** @name VMX MSR - VMCS enumeration field info
  * @{
  */
@@ -1162 +1162 @@
 
 
-/** @name MSR_IA32_VMX_EPT_VPID_CAPS; EPT capabilities MSR
+/** @name VMX MSR - EPT/VPID capabilities.
  * @{
  */
@@ -1181 +1181 @@
 #define MSR_IA32_VMX_EPT_VPID_CAP_INVVPID_SINGLE_CONTEXT_RETAIN_GLOBALS  RT_BIT_64(43)
 /** @} */
+
 
 /** @name Extended Page Table Pointer (EPTP)
@@ -1474 +1475 @@
 
 
-/** @name VMX_VMCS_CTRL_PIN_EXEC
+/** @name Pin-based VM-execution controls.
  * @{
  */
@@ -1493 +1494 @@
 
 
-/** @name VMX_VMCS_CTRL_PROC_EXEC
+/** @name Processor-based VM-execution controls.
  * @{
  */
@@ -1543 +1544 @@
 
 
-/** @name VMX_VMCS_CTRL_PROC_EXEC2
+/** @name Secondary Processor-based VM-execution controls.
  * @{
  */
@@ -1593 +1594 @@
 
 
-/** @name VMX_VMCS_CTRL_ENTRY
+/** @name VM-entry controls.
  * @{
  */
@@ -1614 +1615 @@
 
 
-/** @name VMX_VMCS_CTRL_EXIT
+/** @name VM-exit controls.
  * @{
  */
@@ -1639 +1640 @@
 
 
-/** @name VMX_VMCS_CTRL_VMFUNC
+/** @name VM function controls.
  * @{
  */
@@ -1647 +1648 @@
 
 
-/** @name VMX_VMCS32_RO_EXIT_REASON
+/** @name VM-exit reason.
  * @{
  */
@@ -1654 +1655 @@
 
 
-/** @name VMX_VMCS32_CTRL_ENTRY_INTERRUPTION_INFO
+/** @name VM-entry interruption information.
  * @{
  */
@@ -1663 +1664 @@
 
 
-/** @name VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO
+/** @name VM-exit interruption information.
  * @{
  */
@@ -1681 +1682 @@
 
 
-/** @name VMX_VMCS_RO_EXIT_INTERRUPTION_INFO_TYPE
+/** @name VM-exit interruption information types.
  * @{
  */
@@ -1693 +1694 @@
 
 
-/** @name VMX_VMCS32_RO_IDT_VECTORING_INFO
+/** @name IDT-vectoring information.
  * @{
  */
@@ -1706 +1707 @@
 
 
-/** @name VMX_VMCS_RO_IDT_VECTORING_INFO_TYPE
+/** @name IDT-vectoring information vector types.
  * @{
  */
@@ -1718 +1719 @@
 
 
-/** @name VMX_VMCS_GUEST_ACTIVITY_STATE
+/** @name Guest-activity states.
  * @{
  */
@@ -1732 +1733 @@
 
 
-/** @name VMX_VMCS32_GUEST_INT_STATE
+/** @name Guest-interruptibility states.
  * @{
  */
@@ -1742 +1743 @@
 
 
-/** @name VMX_VMCS_RO_EXIT_QUALIFICATION
+/** @name Exit qualification for Mov DRx.
  * @{
  */
@@ -1759 +1760 @@
 
 
-/** @name VMX_EXIT_QUAL_DRX_DIRECTION values
+/** @name Exit qualification for debug exceptions types.
  * @{
  */
@@ -1767 +1768 @@
 
 
-/** @name CRx accesses
+/** @name Exit qualification for control-register accesses.
  * @{
  */
@@ -1788 +1789 @@
 
 
-/** @name VMX_EXIT_QUAL_CRX_ACCESS
+/** @name Exit qualification for control-register access types.
  * @{
  */
@@ -1798 +1799 @@
 
 
-/** @name VMX_EXIT_QUAL_TASK_SWITCH
+/** @name Exit qualification for task switch.
  * @{
  */
@@ -1814 +1815 @@
 
 
-/** @name VMX_EXIT_EPT_VIOLATION
+/** @name Exit qualification for EPT violations.
  * @{
  */
@@ -1839 +1840 @@
 
 
-/** @name VMX_EXIT_PORT_IO
+/** @name Exit qualification for I/O instructions.
  * @{
  */
@@ -1858 +1859 @@
 
 
-/** @name VMX_EXIT_QUAL_IO_DIRECTION
+/** @name Exit qualification for I/O instruction types.
  * @{
  */
@@ -1866 +1867 @@
 
 
-/** @name VMX_EXIT_QUAL_IO_ENCODING
+/** @name Exit qualification for I/O instruction encoding.
  * @{
  */
@@ -1874 +1875 @@
 
 
-/** @name VMX_EXIT_APIC_ACCESS
+/** @name Exit qualification for APIC-access VM-exits from linear and
+ *        guest-physical accesses.
  * @{
  */
@@ -1886 +1888 @@
 
 
-/** @name VMX_EXIT_QUAL_APIC_ACCESS_TYPE return values
+/** @name Exit qualification for linear address APIC-access types.
  * @{
  */
@@ -2014 +2016 @@
 
 
-/** @name VMX_VMCS_GUEST_DEBUG_EXCEPTIONS
- * Bits 4-11, 13 and 15-63 are reserved.
+/** @name Format of Pending-Debug-Exceptions.
+ * Bits 4-11, 13, 15 and 17-63 are reserved.
  * @{
  */
 /** Hardware breakpoint 0 was met. */
-#define VMX_VMCS_GUEST_DEBUG_EXCEPTIONS_B0                      RT_BIT(0)
+#define VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BP0                   RT_BIT(0)
 /** Hardware breakpoint 1 was met. */
-#define VMX_VMCS_GUEST_DEBUG_EXCEPTIONS_B1                      RT_BIT(1)
+#define VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BP1                   RT_BIT(1)
 /** Hardware breakpoint 2 was met. */
-#define VMX_VMCS_GUEST_DEBUG_EXCEPTIONS_B2                      RT_BIT(2)
+#define VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BP2                   RT_BIT(2)
 /** Hardware breakpoint 3 was met. */
-#define VMX_VMCS_GUEST_DEBUG_EXCEPTIONS_B3                      RT_BIT(3)
+#define VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BP3                   RT_BIT(3)
 /** At least one data or IO breakpoint was hit. */
-#define VMX_VMCS_GUEST_DEBUG_EXCEPTIONS_BREAKPOINT_ENABLED      RT_BIT(12)
+#define VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_EN_BP                 RT_BIT(12)
 /** A debug exception would have been triggered by single-step execution mode. */
-#define VMX_VMCS_GUEST_DEBUG_EXCEPTIONS_BS                      RT_BIT(14)
+#define VMX_VMCS_GUEST_PENDING_DEBUG_XCPT_BS                    RT_BIT(14)
+/** A debug exception occurred inside an RTM region.   */
+#define VMX_VMCS_GUEST_PENDING_DEBUG_RTM                        RT_BIT(16)
 /** @} */