Changeset 92062 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Oct 26, 2021 7:34:48 AM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 Macro for present paging entry check GST_IS_PGENTRY_PRESENT.

File:

• trunk/src/VBox/VMM/include/PGMGstDefs.h (modified) (4 diffs)

trunk/src/VBox/VMM/include/PGMGstDefs.h

@@ -132 +132 @@
 # define GST_IS_BIG_PDPE_VALID(pVCpu, Pdpe)     (true)
 # define GST_IS_PML4E_VALID(pVCpu, Pml4e)       (true)
+# define GST_IS_PGENTRY_PRESENT(pVCpu, Pge)     ((Pge.u) & X86_PTE_P)
 # define GST_IS_PSE_ACTIVE(pVCpu)               (false && This_should_not_be_used_in_this_context)
 
@@ -173 +174 @@
 //# define GST_IS_BIG_PDPE_VALID(pVCpu, Pdpe)     (false)
 //# define GST_IS_PML4E_VALID(pVCpu, Pml4e)       (false)
+# define GST_IS_PGENTRY_PRESENT(pVCpu, Pge)     ((Pge.u) & X86_PTE_P)
 # define GST_IS_PSE_ACTIVE(pVCpu)               pgmGst32BitIsPageSizeExtActive(pVCpu)
 # define GST_IS_NX_ACTIVE(pVCpu)                (false)
@@ -236 +238 @@
 #  define GST_IS_PML4E_VALID(pVCpu, Pml4e)      (!( (Pml4e).u & (pVCpu)->pgm.s.fGstAmd64MbzPml4eMask ))
 # endif
+# define GST_IS_PGENTRY_PRESENT(pVCpu, Pge)     ((Pge.u) & X86_PTE_P)
 # define GST_PT_SHIFT                           X86_PT_PAE_SHIFT
 # define GST_PT_MASK                            X86_PT_PAE_MASK
@@ -287 +290 @@
 # define GST_IS_BIG_PDPE_VALID(pVCpu, Pdpe)     (!( (Pdpe).u  & (pVCpu)->pgm.s.fGstEptMbzBigPdpteMask ))
 # define GST_IS_PML4E_VALID(pVCpu, Pml4e)       (!( (Pml4e).u & (pVCpu)->pgm.s.fGstEptMbzPml4eMask ))
-# define GST_IS_PGENTRY_PRESENT(pVCpu, Entry)   (!( (Entry).u & (pVCpu)->pgm.s.fGstEptPresentMask ))
+# define GST_IS_PGENTRY_PRESENT(pVCpu, Pge)     ((Pge).u & (pVCpu)->pgm.s.fGstEptPresentMask)
 # define GST_IS_PSE_ACTIVE(pVCpu)               (true)
 # define GST_IS_NX_ACTIVE(pVCpu)                (pgmGstIsNoExecuteActive(pVCpu))