Changeset 56985 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jul 18, 2015 10:11:47 PM (9 years ago)

Author:

vboxsync

Message:

VMM: Log and assertion formatting fixes.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (3 diffs)
• HMSVMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -3240 +3240 @@
         /** @todo R0 -> VM request */
         /* The chunk can be mapped by more than one VM if fBoundMemoryMode is false! */
-        Log(("gmmR0FreeChunk: chunk still has %d/%d mappings; don't free!\n", pChunk->cMappingsX));
+        Log(("gmmR0FreeChunk: chunk still has %d mappings; don't free!\n", pChunk->cMappingsX));
         gmmR0ChunkMutexRelease(&MtxState, pChunk);
         return false;
@@ -4379 +4379 @@
                                struct VMMDEVSHAREDREGIONDESC const *paRegions, PGMMSHAREDMODULE *ppGblMod)
 {
-    Log(("gmmR0ShModNewGlobal: %s %s size %#x os %u rgn %u\n", pszModuleName, pszVersion, cbModule, cRegions));
+    Log(("gmmR0ShModNewGlobal: %s %s size %#x os %u rgn %u\n", pszModuleName, pszVersion, cbModule, enmGuestOS, cRegions));
     if (pGMM->cShareableModules >= GMM_MAX_SHARED_GLOBAL_MODULES)
     {
@@ -4972 +4972 @@
     uint32_t uChecksum = pPageDesc->u32StrictChecksum & UINT32_C(0x00003fff);
     AssertMsg(!uChecksum || uChecksum == pPage->Shared.u14Checksum || !pPage->Shared.u14Checksum,
-              ("%#x vs %#x - idPage=%# - %s %s\n", uChecksum, pPage->Shared.u14Checksum,
+              ("%#x vs %#x - idPage=%#x - %s %s\n", uChecksum, pPage->Shared.u14Checksum,
                pGlobalRegion->paidPages[idxPage], pModule->szName, pModule->szVersion));
 #endif

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -4100 +4100 @@
                     && uExitVector == X86_XCPT_PF)
                 {
-                    Log4(("IDT: Contributory #PF uCR2=%#RX64\n", pVCpu->idCpu, pCtx->cr2));
+                    Log4(("IDT: Contributory #PF idCpu=%#x uCR2=%#RX64\n", pVCpu->idCpu, pCtx->cr2));
                 }
 #endif
@@ -4533 +4533 @@
 
             default:
-                AssertMsgFailed(("hmR0SvmExitWriteCRx: Invalid/Unexpected Write-CRx exit. u64ExitCode=%#RX64 %#x CRx=%#RX64\n",
-                                pSvmTransient->u64ExitCode, pSvmTransient->u64ExitCode - SVM_EXIT_WRITE_CR0));
+                AssertMsgFailed(("hmR0SvmExitWriteCRx: Invalid/Unexpected Write-CRx exit. u64ExitCode=%#RX64 %#x\n",
+                                 pSvmTransient->u64ExitCode, pSvmTransient->u64ExitCode - SVM_EXIT_WRITE_CR0));
                 break;
         }