Changeset 86464 in vbox for trunk/include/VBox

Timestamp:

Oct 7, 2020 8:09:22 AM (5 years ago)

Author:

vboxsync

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

140770

Message:

VMM/PGMAll.h: No EPT bitfields. bugref:9841 bugref:9746

File:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -445 +445 @@
 /** @} */
 
-/** @name VMX EPT paging structures
- * @{
- */
-
-/** @name Common bits
+/** @name VMX Extended Page Tables (EPT) Common Bits
  * @{ */
 /** Bit 0 - Readable (we often think of it as present). */
@@ -484 +480 @@
 /** Bits 3-5 - Memory type: WB. */
 #define EPT_E_TYPE_WB           (UINT64_C(6) << EPT_E_TYPE_SHIFT)
+/** Bits 3-5 - Memory type: Invalid (7). */
+#define EPT_E_TYPE_INVALID_7    (UINT64_C(7) << EPT_E_TYPE_SHIFT)
 
 /** Bit 6 - Ignore page attribute table (leaf, MBZ). */
@@ -526 +524 @@
 /** @} */
 
+
+/** @name VMX Extended Page Tables (EPT) Structures
+ * @{
+ */
+
 /**
  * Number of page table entries in the EPT. (PDPTE/PDE/PTE)
@@ -570 +573 @@
 typedef union EPTPML4E
 {
+#ifndef VBOX_WITHOUT_PAGING_BIT_FIELDS
     /** Normal view. */
     EPTPML4EBITS    n;
+#endif
     /** Unsigned integer view. */
     X86PGPAEUINT    u;
@@ -635 +640 @@
 typedef union EPTPDPTE
 {
+#ifndef VBOX_WITHOUT_PAGING_BIT_FIELDS
     /** Normal view. */
     EPTPDPTEBITS    n;
+#endif
     /** Unsigned integer view. */
     X86PGPAEUINT    u;
@@ -734 +741 @@
 typedef union EPTPDE
 {
+#ifndef VBOX_WITHOUT_PAGING_BIT_FIELDS
     /** Normal view. */
     EPTPDEBITS      n;
     /** 2MB view (big). */
     EPTPDE2MBITS    b;
+#endif
     /** Unsigned integer view. */
     X86PGPAEUINT    u;
@@ -808 +817 @@
 typedef union EPTPTE
 {
+#ifndef VBOX_WITHOUT_PAGING_BIT_FIELDS
     /** Normal view. */
     EPTPTEBITS      n;
+#endif
     /** Unsigned integer view. */
     X86PGPAEUINT    u;