Changeset 73346 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 25, 2018 9:24:03 AM (6 years ago)

Author:

vboxsync

Message:

DBGFR3PagingDumpEx: Deal with shadow mode PGMMODE_NONE (NEM). bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/DBGFMem.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFMem.cpp

@@ -545 +545 @@
             return DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_LME | DBGFPGDMP_FLAGS_NXE;
         case PGMMODE_NESTED_32BIT:
-            return DBGFPGDMP_FLAGS_NP; /** @todo fix nested paging dumping*/
+            return DBGFPGDMP_FLAGS_NP | DBGFPGDMP_FLAGS_PSE;
         case PGMMODE_NESTED_PAE:
-            return DBGFPGDMP_FLAGS_NP; /** @todo fix nested paging dumping*/
+            return DBGFPGDMP_FLAGS_NP | DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_NXE;
         case PGMMODE_NESTED_AMD64:
-            return DBGFPGDMP_FLAGS_NP; /** @todo fix nested paging dumping*/
+            return DBGFPGDMP_FLAGS_NP | DBGFPGDMP_FLAGS_PSE | DBGFPGDMP_FLAGS_PAE | DBGFPGDMP_FLAGS_LME | DBGFPGDMP_FLAGS_NXE;
         case PGMMODE_EPT:
             return DBGFPGDMP_FLAGS_EPT;
+        case PGMMODE_NONE:
+            return 0;
         default:
             AssertFailedReturn(UINT32_MAX);
@@ -600 +602 @@
         if (fFlags & DBGFPGDMP_FLAGS_SHADOW)
         {
+            if (PGMGetShadowMode(pVCpu) == PGMMODE_NONE)
+            {
+                pHlp->pfnPrintf(pHlp, "Shadow paging mode is 'none' (NEM)\n");
+                return VINF_SUCCESS;
+            }
+
             if (fFlags & DBGFPGDMP_FLAGS_CURRENT_CR3)
                 cr3 = PGMGetHyperCR3(pVCpu);
             if (fFlags & DBGFPGDMP_FLAGS_CURRENT_MODE)
-            {
                 fFlags |= dbgfR3PagingDumpModeToFlags(PGMGetShadowMode(pVCpu));
-                if (fFlags & DBGFPGDMP_FLAGS_NP)
-                {
-                    fFlags |= dbgfR3PagingDumpModeToFlags(PGMGetHostMode(pVM));
-                    if (HC_ARCH_BITS == 32 && CPUMIsGuestInLongMode(pVCpu))
-                        fFlags |= DBGFPGDMP_FLAGS_LME;
-                }
-            }
         }
         else