Changeset 108943 in vbox for trunk/src/VBox/VMM/testcase/tstPGMAllGst-armv8.cpp

Timestamp:

Apr 11, 2025 9:04:14 AM (4 weeks ago)

Author:

vboxsync

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

168454

Message:

VMM: Some additions for the ARMv8 PGM testcase, bugref:10388

File:

• trunk/src/VBox/VMM/testcase/tstPGMAllGst-armv8.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/testcase/tstPGMAllGst-armv8.cpp

@@ -921 +921 @@
             BITFIELD_CREATE_BOOL(NotExecutable,       7),
             BITFIELD_CREATE_BOOL(NotAccessibleByMode, 8),
-            { NULL,     0, 0, NULL }
+            { "Level",  11, 5, NULL },
+            { NULL,      0, 0, NULL }
 
 #undef BITFIELD_CREATE_BOOL
@@ -1006 +1007 @@
     WalkResult.GCPhysNested = pWalkResult->GCPhysNested;
     WalkResult.GCPhys       = pWalkResult->GCPhys;
-    WalkResult.fFailed      = pWalkResult->fFailed;
     WalkResult.fEffective   = pWalkResult->fEffective;
-    WalkResult.uLevel       = (pWalkResult->fFailed & PGM_WALKFAIL_LEVEL_MASK) >> PGM_WALKFAIL_LEVEL_SHIFT;
-    if (pWalkResult->fInfo & PGM_WALKINFO_SUCCEEDED)
-        WalkResult.fSucceeded = true;
+
     if (pWalkResult->fInfo & PGM_WALKINFO_IS_SLAT)
         WalkResult.fIsSlat = true;
@@ -1025 +1023 @@
     if (pWalkResult->fFailed & PGM_WALKFAIL_BAD_PHYSICAL_ADDRESS)
         WalkResult.fBadPhysAddr = true;
+
+    /*
+     * QueryPageFast() can return VERR_ACCESS_DENIED, which GetPage() doesn't,
+     * so only copy the failed result if GetPage() is expected to fail as well.
+     */
+    if (RT_FAILURE(rcExpected))
+    {         
+        WalkResult.fFailed    = pWalkResult->fFailed;
+        WalkResult.uLevel     = (pWalkResult->fFailed & PGM_WALKFAIL_LEVEL_MASK) >> PGM_WALKFAIL_LEVEL_SHIFT;
+        WalkResult.fSucceeded = false;
+    } 
+    else
+        WalkResult.fSucceeded = true;
 
     /** @todo Incorporate EL (for nested virt and EL3 later on). */