Changeset 35696 in vbox for trunk/src/VBox/VMM
- Timestamp:
- Jan 24, 2011 6:03:33 PM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 69622
- Location:
- trunk/src/VBox/VMM
- Files:
-
- 8 edited
-
VMMR3/CSAM.cpp (modified) (3 diffs)
-
VMMR3/PATM.cpp (modified) (3 diffs)
-
VMMR3/PDMAsyncCompletionFile.cpp (modified) (3 diffs)
-
VMMR3/PGM.cpp (modified) (8 diffs)
-
VMMR3/PGMPool.cpp (modified) (8 diffs)
-
VMMR3/PGMSharedPage.cpp (modified) (3 diffs)
-
VMMR3/STAM.cpp (modified) (4 diffs)
-
include/PGMInternal.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/VMM/VMMR3/CSAM.cpp
r35694 r35696 85 85 *******************************************************************************/ 86 86 #ifdef VBOX_WITH_DEBUGGER 87 static DECLCALLBACK(int) csamr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);88 static DECLCALLBACK(int) csamr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);87 static DECLCALLBACK(int) csamr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 88 static DECLCALLBACK(int) csamr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 89 89 90 90 /** Command descriptors. */ 91 91 static const DBGCCMD g_aCmds[] = 92 92 { 93 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, pResultDesc, fFlags, pfnHandler pszSyntax,....pszDescription */94 { "csamon", 0, 0, NULL, 0, NULL, 0, csamr3CmdOn, "", "Enable CSAM code scanning."},95 { "csamoff", 0, 0, NULL, 0, NULL, 0, csamr3CmdOff, "","Disable CSAM code scanning." },93 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, fFlags, pfnHandler pszSyntax, ....pszDescription */ 94 { "csamon", 0, 0, NULL, 0, 0, csamr3CmdOn, "", "Enable CSAM code scanning." }, 95 { "csamoff", 0, 0, NULL, 0, 0, csamr3CmdOff, "", "Disable CSAM code scanning." }, 96 96 }; 97 97 #endif … … 2674 2674 * @param cArgs Number of arguments in the array. 2675 2675 */ 2676 static DECLCALLBACK(int) csamr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)2676 static DECLCALLBACK(int) csamr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 2677 2677 { 2678 2678 DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM); … … 2694 2694 * @param cArgs Number of arguments in the array. 2695 2695 */ 2696 static DECLCALLBACK(int) csamr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)2696 static DECLCALLBACK(int) csamr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 2697 2697 { 2698 2698 DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM); -
trunk/src/VBox/VMM/VMMR3/PATM.cpp
r35348 r35696 80 80 #ifdef VBOX_WITH_DEBUGGER 81 81 static DECLCALLBACK(int) DisableAllPatches(PAVLOU32NODECORE pNode, void *pVM); 82 static DECLCALLBACK(int) patmr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);83 static DECLCALLBACK(int) patmr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);82 static DECLCALLBACK(int) patmr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 83 static DECLCALLBACK(int) patmr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 84 84 85 85 /** Command descriptors. */ 86 86 static const DBGCCMD g_aCmds[] = 87 87 { 88 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, pResultDesc, fFlags, pfnHandler pszSyntax,....pszDescription */89 { "patmon", 0, 0, NULL, 0, NULL, 0, patmr3CmdOn, "", "Enable patching."},90 { "patmoff", 0, 0, NULL, 0, NULL, 0, patmr3CmdOff, "","Disable patching." },88 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, fFlags, pfnHandler pszSyntax, ....pszDescription */ 89 { "patmon", 0, 0, NULL, 0, 0, patmr3CmdOn, "", "Enable patching." }, 90 { "patmoff", 0, 0, NULL, 0, 0, patmr3CmdOff, "", "Disable patching." }, 91 91 }; 92 92 #endif … … 6528 6528 * @param cArgs Number of arguments in the array. 6529 6529 */ 6530 static DECLCALLBACK(int) patmr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)6530 static DECLCALLBACK(int) patmr3CmdOff(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 6531 6531 { 6532 6532 /* … … 6551 6551 * @param cArgs Number of arguments in the array. 6552 6552 */ 6553 static DECLCALLBACK(int) patmr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)6553 static DECLCALLBACK(int) patmr3CmdOn(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 6554 6554 { 6555 6555 /* -
trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp
r35694 r35696 74 74 *******************************************************************************/ 75 75 #ifdef VBOX_WITH_DEBUGGER 76 static DECLCALLBACK(int) pdmacEpFileErrorInject(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR pArgs, unsigned cArgs , PDBGCVAR pResult);76 static DECLCALLBACK(int) pdmacEpFileErrorInject(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR pArgs, unsigned cArgs); 77 77 #endif 78 78 … … 92 92 static const DBGCCMD g_aCmds[] = 93 93 { 94 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, pResultDesc, fFlags, pfnHandler pszSyntax,....pszDescription */95 { "injecterror", 3, 3, &g_aInjectErrorArgs[0], 3, NULL, 0, pdmacEpFileErrorInject, "","Inject error into I/O subsystem." },94 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, fFlags, pfnHandler pszSyntax, ....pszDescription */ 95 { "injecterror", 3, 3, &g_aInjectErrorArgs[0], 3, 0, pdmacEpFileErrorInject, "", "Inject error into I/O subsystem." }, 96 96 }; 97 97 #endif … … 697 697 * Error inject callback. 698 698 */ 699 static DECLCALLBACK(int) pdmacEpFileErrorInject(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR pArgs, unsigned cArgs , PDBGCVAR pResult)699 static DECLCALLBACK(int) pdmacEpFileErrorInject(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR pArgs, unsigned cArgs) 700 700 { 701 701 /* -
trunk/src/VBox/VMM/VMMR3/PGM.cpp
r35346 r35696 624 624 #ifdef VBOX_WITH_DEBUGGER 625 625 /** @todo Convert the first two commands to 'info' items. */ 626 static DECLCALLBACK(int) pgmR3CmdRam(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);627 static DECLCALLBACK(int) pgmR3CmdError(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);628 static DECLCALLBACK(int) pgmR3CmdSync(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);629 static DECLCALLBACK(int) pgmR3CmdSyncAlways(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);626 static DECLCALLBACK(int) pgmR3CmdRam(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 627 static DECLCALLBACK(int) pgmR3CmdError(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 628 static DECLCALLBACK(int) pgmR3CmdSync(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 629 static DECLCALLBACK(int) pgmR3CmdSyncAlways(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 630 630 # ifdef VBOX_STRICT 631 static DECLCALLBACK(int) pgmR3CmdAssertCR3(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);631 static DECLCALLBACK(int) pgmR3CmdAssertCR3(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 632 632 # endif 633 static DECLCALLBACK(int) pgmR3CmdPhysToFile(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);633 static DECLCALLBACK(int) pgmR3CmdPhysToFile(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 634 634 #endif 635 635 … … 665 665 static const DBGCCMD g_aCmds[] = 666 666 { 667 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, pResultDesc, fFlags,pfnHandler pszSyntax, ....pszDescription */668 { "pgmram", 0, 0, NULL, 0, NULL, 0,pgmR3CmdRam, "", "Display the ram ranges." },669 { "pgmsync", 0, 0, NULL, 0, NULL, 0,pgmR3CmdSync, "", "Sync the CR3 page." },670 { "pgmerror", 0, 1, &g_aPgmErrorArgs[0], 1, NULL, 0,pgmR3CmdError, "", "Enables inject runtime of errors into parts of PGM." },671 { "pgmerroroff", 0, 1, &g_aPgmErrorArgs[0], 1, NULL, 0,pgmR3CmdError, "", "Disables inject runtime errors into parts of PGM." },667 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, fFlags, pfnHandler pszSyntax, ....pszDescription */ 668 { "pgmram", 0, 0, NULL, 0, 0, pgmR3CmdRam, "", "Display the ram ranges." }, 669 { "pgmsync", 0, 0, NULL, 0, 0, pgmR3CmdSync, "", "Sync the CR3 page." }, 670 { "pgmerror", 0, 1, &g_aPgmErrorArgs[0], 1, 0, pgmR3CmdError, "", "Enables inject runtime of errors into parts of PGM." }, 671 { "pgmerroroff", 0, 1, &g_aPgmErrorArgs[0], 1, 0, pgmR3CmdError, "", "Disables inject runtime errors into parts of PGM." }, 672 672 # ifdef VBOX_STRICT 673 { "pgmassertcr3", 0, 0, NULL, 0, NULL, 0,pgmR3CmdAssertCR3, "", "Check the shadow CR3 mapping." },673 { "pgmassertcr3", 0, 0, NULL, 0, 0, pgmR3CmdAssertCR3, "", "Check the shadow CR3 mapping." }, 674 674 # if HC_ARCH_BITS == 64 675 { "pgmcheckduppages", 0, 0, NULL, 0, NULL, 0,pgmR3CmdCheckDuplicatePages, "", "Check for duplicate pages in all running VMs." },676 { "pgmsharedmodules", 0, 0, NULL, 0, NULL, 0,pgmR3CmdShowSharedModules, "", "Print shared modules info." },675 { "pgmcheckduppages", 0, 0, NULL, 0, 0, pgmR3CmdCheckDuplicatePages, "", "Check for duplicate pages in all running VMs." }, 676 { "pgmsharedmodules", 0, 0, NULL, 0, 0, pgmR3CmdShowSharedModules, "", "Print shared modules info." }, 677 677 # endif 678 678 # endif 679 { "pgmsyncalways", 0, 0, NULL, 0, NULL, 0,pgmR3CmdSyncAlways, "", "Toggle permanent CR3 syncing." },680 { "pgmphystofile", 1, 2, &g_aPgmPhysToFileArgs[0], 2, NULL, 0,pgmR3CmdPhysToFile, "", "Save the physical memory to file." },679 { "pgmsyncalways", 0, 0, NULL, 0, 0, pgmR3CmdSyncAlways, "", "Toggle permanent CR3 syncing." }, 680 { "pgmphystofile", 1, 2, &g_aPgmPhysToFileArgs[0], 2, 0, pgmR3CmdPhysToFile, "", "Save the physical memory to file." }, 681 681 }; 682 682 #endif … … 3530 3530 * @param cArgs Number of arguments in the array. 3531 3531 */ 3532 static DECLCALLBACK(int) pgmR3CmdRam(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)3532 static DECLCALLBACK(int) pgmR3CmdRam(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 3533 3533 { 3534 3534 /* … … 3568 3568 * @param cArgs Number of arguments in the array. 3569 3569 */ 3570 static DECLCALLBACK(int) pgmR3CmdError(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)3570 static DECLCALLBACK(int) pgmR3CmdError(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 3571 3571 { 3572 3572 /* … … 3614 3614 * @param cArgs Number of arguments in the array. 3615 3615 */ 3616 static DECLCALLBACK(int) pgmR3CmdSync(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)3616 static DECLCALLBACK(int) pgmR3CmdSync(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 3617 3617 { 3618 3618 /** @todo SMP support */ … … 3650 3650 * @param cArgs Number of arguments in the array. 3651 3651 */ 3652 static DECLCALLBACK(int) pgmR3CmdAssertCR3(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)3652 static DECLCALLBACK(int) pgmR3CmdAssertCR3(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 3653 3653 { 3654 3654 /** @todo SMP support!! */ … … 3683 3683 * @param cArgs Number of arguments in the array. 3684 3684 */ 3685 static DECLCALLBACK(int) pgmR3CmdSyncAlways(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)3685 static DECLCALLBACK(int) pgmR3CmdSyncAlways(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 3686 3686 { 3687 3687 /** @todo SMP support!! */ … … 3721 3721 * @param cArgs Number of arguments in the array. 3722 3722 */ 3723 static DECLCALLBACK(int) pgmR3CmdPhysToFile(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)3723 static DECLCALLBACK(int) pgmR3CmdPhysToFile(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 3724 3724 { 3725 3725 /* -
trunk/src/VBox/VMM/VMMR3/PGMPool.cpp
r35346 r35696 115 115 static DECLCALLBACK(int) pgmR3PoolAccessHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser); 116 116 #ifdef VBOX_WITH_DEBUGGER 117 static DECLCALLBACK(int) pgmR3PoolCmdCheck(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);117 static DECLCALLBACK(int) pgmR3PoolCmdCheck(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 118 118 #endif 119 119 … … 122 122 static const DBGCCMD g_aCmds[] = 123 123 { 124 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, pResultDesc, fFlags, pfnHandler pszSyntax,....pszDescription */125 { "pgmpoolcheck", 0, 0, NULL, 0, NULL, 0, pgmR3PoolCmdCheck, "","Check the pgm pool pages." },124 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, fFlags, pfnHandler pszSyntax, ....pszDescription */ 125 { "pgmpoolcheck", 0, 0, NULL, 0, 0, pgmR3PoolCmdCheck, "", "Check the pgm pool pages." }, 126 126 }; 127 127 #endif … … 976 976 * @param cArgs Number of arguments in the array. 977 977 */ 978 static DECLCALLBACK(int) pgmR3PoolCmdCheck(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)978 static DECLCALLBACK(int) pgmR3PoolCmdCheck(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 979 979 { 980 /* 981 * Validate input. 982 */ 983 if (!pVM) 984 return pCmdHlp->pfnPrintf(pCmdHlp, NULL, "error: The command requires a VM to be selected.\n"); 980 DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM); 981 DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, -1, cArgs == 0); 982 uint32_t cErrors = 0; 985 983 986 984 PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool); 987 988 985 for (unsigned i = 0; i < pPool->cCurPages; i++) 989 986 { 990 PPGMPOOLPAGE pPage= &pPool->aPages[i];991 bool fFirstMsg = true;987 PPGMPOOLPAGE pPage = &pPool->aPages[i]; 988 bool fFirstMsg = true; 992 989 993 990 /* Todo: cover other paging modes too. */ … … 996 993 PPGMSHWPTPAE pShwPT = (PPGMSHWPTPAE)PGMPOOL_PAGE_2_PTR(pPool->CTX_SUFF(pVM), pPage); 997 994 { 998 PX86PTPAE pGstPT;999 PGMPAGEMAPLOCK LockPage;995 PX86PTPAE pGstPT; 996 PGMPAGEMAPLOCK LockPage; 1000 997 int rc = PGMPhysGCPhys2CCPtrReadOnly(pVM, pPage->GCPhys, (const void **)&pGstPT, &LockPage); AssertReleaseRC(rc); 1001 998 … … 1012 1009 if (fFirstMsg) 1013 1010 { 1014 pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Check pool page %RGp\n", pPage->GCPhys);1011 DBGCCmdHlpPrintf(pCmdHlp, "Check pool page %RGp\n", pPage->GCPhys); 1015 1012 fFirstMsg = false; 1016 1013 } 1017 pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Mismatch HCPhys: rc=%Rrc idx=%d guest %RX64 shw=%RX64 vs %RHp\n", rc, j, pGstPT->a[j].u, PGMSHWPTEPAE_GET_LOG(pShwPT->a[j]), HCPhys); 1014 DBGCCmdHlpPrintf(pCmdHlp, "Mismatch HCPhys: rc=%Rrc idx=%d guest %RX64 shw=%RX64 vs %RHp\n", rc, j, pGstPT->a[j].u, PGMSHWPTEPAE_GET_LOG(pShwPT->a[j]), HCPhys); 1015 cErrors++; 1018 1016 } 1019 1017 else if ( PGMSHWPTEPAE_IS_RW(pShwPT->a[j]) … … 1022 1020 if (fFirstMsg) 1023 1021 { 1024 pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Check pool page %RGp\n", pPage->GCPhys);1022 DBGCCmdHlpPrintf(pCmdHlp, "Check pool page %RGp\n", pPage->GCPhys); 1025 1023 fFirstMsg = false; 1026 1024 } 1027 pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Mismatch r/w gst/shw: idx=%d guest %RX64 shw=%RX64 vs %RHp\n", j, pGstPT->a[j].u, PGMSHWPTEPAE_GET_LOG(pShwPT->a[j]), HCPhys); 1025 DBGCCmdHlpPrintf(pCmdHlp, "Mismatch r/w gst/shw: idx=%d guest %RX64 shw=%RX64 vs %RHp\n", j, pGstPT->a[j].u, PGMSHWPTEPAE_GET_LOG(pShwPT->a[j]), HCPhys); 1026 cErrors++; 1028 1027 } 1029 1028 } … … 1056 1055 if (fFirstMsg) 1057 1056 { 1058 pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Check pool page %RGp\n", pPage->GCPhys);1057 DBGCCmdHlpPrintf(pCmdHlp, "Check pool page %RGp\n", pPage->GCPhys); 1059 1058 fFirstMsg = false; 1060 1059 } 1061 pCmdHlp->pfnPrintf(pCmdHlp, NULL, "Mismatch: r/w: GCPhys=%RGp idx=%d shw %RX64 %RX64\n", pTempPage->GCPhys, k, PGMSHWPTEPAE_GET_LOG(pShwPT->a[k]), PGMSHWPTEPAE_GET_LOG(pShwPT2->a[k])); 1060 DBGCCmdHlpPrintf(pCmdHlp, "Mismatch: r/w: GCPhys=%RGp idx=%d shw %RX64 %RX64\n", pTempPage->GCPhys, k, PGMSHWPTEPAE_GET_LOG(pShwPT->a[k]), PGMSHWPTEPAE_GET_LOG(pShwPT2->a[k])); 1061 cErrors++; 1062 1062 } 1063 1063 } … … 1067 1067 } 1068 1068 } 1069 if (cErrors > 0) 1070 return DBGCCmdHlpFail(pCmdHlp, pCmd, "Found %#x errors", cErrors); 1069 1071 return VINF_SUCCESS; 1070 1072 } -
trunk/src/VBox/VMM/VMMR3/PGMSharedPage.cpp
r35346 r35696 304 304 * @param cArgs Number of arguments in the array. 305 305 */ 306 DECLCALLBACK(int) pgmR3CmdCheckDuplicatePages(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)306 DECLCALLBACK(int) pgmR3CmdCheckDuplicatePages(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 307 307 { 308 308 unsigned cBallooned = 0; … … 395 395 * @param cArgs Number of arguments in the array. 396 396 */ 397 DECLCALLBACK(int) pgmR3CmdShowSharedModules(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)397 DECLCALLBACK(int) pgmR3CmdShowSharedModules(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 398 398 { 399 399 unsigned i = 0; … … 409 409 } 410 410 i++; 411 } 412 while (i < RT_ELEMENTS(g_apSharedModules)); 411 } while (i < RT_ELEMENTS(g_apSharedModules)); 413 412 pgmUnlock(pVM); 414 413 -
trunk/src/VBox/VMM/VMMR3/STAM.cpp
r35694 r35696 151 151 152 152 #ifdef VBOX_WITH_DEBUGGER 153 static DECLCALLBACK(int) stamR3CmdStats(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);153 static DECLCALLBACK(int) stamR3CmdStats(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 154 154 static DECLCALLBACK(void) stamR3EnumDbgfPrintf(PSTAMR3PRINTONEARGS pArgs, const char *pszFormat, ...); 155 static DECLCALLBACK(int) stamR3CmdStatsReset(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);155 static DECLCALLBACK(int) stamR3CmdStatsReset(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 156 156 #endif 157 157 … … 171 171 static const DBGCCMD g_aCmds[] = 172 172 { 173 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, pResultDesc,fFlags, pfnHandler pszSyntax, ....pszDescription */174 { "stats", 0, 1, &g_aArgPat[0], RT_ELEMENTS(g_aArgPat), NULL,0, stamR3CmdStats, "[pattern]", "Display statistics." },175 { "statsreset", 0, 1, &g_aArgPat[0], RT_ELEMENTS(g_aArgPat), NULL,0, stamR3CmdStatsReset,"[pattern]", "Resets statistics." }173 /* pszCmd, cArgsMin, cArgsMax, paArgDesc, cArgDescs, fFlags, pfnHandler pszSyntax, ....pszDescription */ 174 { "stats", 0, 1, &g_aArgPat[0], RT_ELEMENTS(g_aArgPat), 0, stamR3CmdStats, "[pattern]", "Display statistics." }, 175 { "statsreset", 0, 1, &g_aArgPat[0], RT_ELEMENTS(g_aArgPat), 0, stamR3CmdStatsReset,"[pattern]", "Resets statistics." } 176 176 }; 177 177 #endif … … 1917 1917 * @param cArgs Number of arguments in the array. 1918 1918 */ 1919 static DECLCALLBACK(int) stamR3CmdStats(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)1919 static DECLCALLBACK(int) stamR3CmdStats(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 1920 1920 { 1921 1921 /* … … 1968 1968 * @param cArgs Number of arguments in the array. 1969 1969 */ 1970 static DECLCALLBACK(int) stamR3CmdStatsReset(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult)1970 static DECLCALLBACK(int) stamR3CmdStatsReset(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs) 1971 1971 { 1972 1972 /* -
trunk/src/VBox/VMM/include/PGMInternal.h
r35346 r35696 3855 3855 3856 3856 # if defined(VBOX_STRICT) && HC_ARCH_BITS == 64 3857 DECLCALLBACK(int) pgmR3CmdCheckDuplicatePages(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);3858 DECLCALLBACK(int) pgmR3CmdShowSharedModules(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs , PDBGCVAR pResult);3857 DECLCALLBACK(int) pgmR3CmdCheckDuplicatePages(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 3858 DECLCALLBACK(int) pgmR3CmdShowSharedModules(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PVM pVM, PCDBGCVAR paArgs, unsigned cArgs); 3859 3859 # endif 3860 3860
Note:
See TracChangeset
for help on using the changeset viewer.
