Changeset 101059 in vbox

Timestamp:

Sep 8, 2023 7:50:06 AM (15 months ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10318 EPT memtype define nits.

File:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -410 +410 @@
 
 
+/** @name VMX EPT memory type encodings.
+ * @{ */
+#define VMX_EPT_MT_UC                                           UINT64_C(0)
+#define VMX_EPT_MT_WC                                           UINT64_C(1)
+#define VMX_EPT_MT_RSVD_2                                       UINT64_C(2)
+#define VMX_EPT_MT_RSVD_3                                       UINT64_C(3)
+#define VMX_EPT_MT_WT                                           UINT64_C(4)
+#define VMX_EPT_MT_WP                                           UINT64_C(5)
+#define VMX_EPT_MT_WB                                           UINT64_C(6)
+#define VMX_EPT_MT_RSVD_7                                       UINT64_C(7)
+/** @} */
+
+
 /** @name VMX Extended Page Tables (EPT) Common Bits.
  * @{ */
@@ -432 +445 @@
 #define EPT_E_MEMTYPE_SHIFT                 3
 /** Bits 3-5 - Memory type: UC (Uncacheable). */
-#define EPT_E_MEMTYPE_UC                    (UINT64_C(0) << EPT_E_MEMTYPE_SHIFT)
+#define EPT_E_MEMTYPE_UC                    (VMX_EPT_MT_UC << EPT_E_MEMTYPE_SHIFT)
 /** Bits 3-5 - Memory type: WC (Write Combining). */
-#define EPT_E_MEMTYPE_WC                    (UINT64_C(1) << EPT_E_MEMTYPE_SHIFT)
+#define EPT_E_MEMTYPE_WC                    (VMX_EPT_MT_WC << EPT_E_MEMTYPE_SHIFT)
 /** Bits 3-5 - Memory type: Invalid (2). */
-#define EPT_E_MEMTYPE_INVALID_2             (UINT64_C(2) << EPT_E_MEMTYPE_SHIFT)
+#define EPT_E_MEMTYPE_INVALID_2             (VMX_EPT_MT_RSVD_2 << EPT_E_MEMTYPE_SHIFT)
 /** Bits 3-5 - Memory type: Invalid (3). */
-#define EPT_E_MEMTYPE_INVALID_3             (UINT64_C(3) << EPT_E_MEMTYPE_SHIFT)
+#define EPT_E_MEMTYPE_INVALID_3             (VMX_EPT_MT_RSVD_3 << EPT_E_MEMTYPE_SHIFT)
 /** Bits 3-5 - Memory type: WT (Write Through). */
-#define EPT_E_MEMTYPE_WT                    (UINT64_C(4) << EPT_E_MEMTYPE_SHIFT)
+#define EPT_E_MEMTYPE_WT                    (VMX_EPT_MT_WT << EPT_E_MEMTYPE_SHIFT)
 /** Bits 3-5 - Memory type: WP (Write Protected). */
-#define EPT_E_MEMTYPE_WP                    (UINT64_C(5) << EPT_E_MEMTYPE_SHIFT)
+#define EPT_E_MEMTYPE_WP                    (VMX_EPT_MT_WP << EPT_E_MEMTYPE_SHIFT)
 /** Bits 3-5 - Memory type: WB (Write Back). */
-#define EPT_E_MEMTYPE_WB                    (UINT64_C(6) << EPT_E_MEMTYPE_SHIFT)
+#define EPT_E_MEMTYPE_WB                    (VMX_EPT_MT_WB << EPT_E_MEMTYPE_SHIFT)
 /** Bits 3-5 - Memory type: Invalid (7). */
-#define EPT_E_MEMTYPE_INVALID_7             (UINT64_C(7) << EPT_E_MEMTYPE_SHIFT)
+#define EPT_E_MEMTYPE_INVALID_7             (VMX_EPT_MT_RSVD_7 << EPT_E_MEMTYPE_SHIFT)
 /** Bit 6 - Ignore page attribute table (leaf, MBZ). */
 #define EPT_E_BIT_IGNORE_PAT                6