Changeset 56985 in vbox for trunk/src/VBox

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

Files:

• VMMAll/CPUMAllMsrs.cpp (modified) (8 diffs)
• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMAll/EMAll.cpp (modified) (3 diffs)
• VMMAll/IEMAll.cpp (modified) (2 diffs)
• VMMAll/IOMAll.cpp (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (3 diffs)
• VMMR0/GMMR0.cpp (modified) (3 diffs)
• VMMR0/HMSVMR0.cpp (modified) (2 diffs)
• VMMR3/CPUMR3CpuId.cpp (modified) (2 diffs)
• VMMR3/DBGFR3PlugIn.cpp (modified) (1 diff)
• VMMR3/EM.cpp (modified) (1 diff)
• VMMR3/GIM.cpp (modified) (1 diff)
• VMMR3/GIMKvm.cpp (modified) (2 diffs)
• VMMR3/IOM.cpp (modified) (4 diffs)
• VMMR3/PDMAsyncCompletion.cpp (modified) (1 diff)
• VMMR3/PDMBlkCache.cpp (modified) (1 diff)
• VMMR3/PDMDevHlp.cpp (modified) (7 diffs)
• VMMR3/PDMDevice.cpp (modified) (2 diffs)
• VMMR3/PDMDriver.cpp (modified) (7 diffs)
• VMMR3/PDMQueue.cpp (modified) (4 diffs)
• VMMR3/PDMUsb.cpp (modified) (3 diffs)
• VMMR3/PGMHandler.cpp (modified) (1 diff)
• VMMR3/PGMSavedState.cpp (modified) (1 diff)
• VMMR3/SELM.cpp (modified) (1 diff)
• VMMRC/PATMRC.cpp (modified) (1 diff)
• VMMRC/SELMRC.cpp (modified) (1 diff)
• VMMRC/TRPMRCHandlers.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

@@ -493 +493 @@
     if ((uValue & 0xff) >= 7)
     {
-        Log(("CPUM: Invalid MTRR default type value: %#llx (%#llx)\n", pRange->szName, uValue, uValue & 0xff));
+        Log(("CPUM: Invalid MTRR default type value on %s: %#llx (%#llx)\n", pRange->szName, uValue, uValue & 0xff));
         return VERR_CPUM_RAISE_GP_0;
     }
@@ -1411 +1411 @@
     if (!X86_IS_CANONICAL(uValue))
     {
-        Log(("CPUM: wrmsr %s(%#x), %#llx -> %#GP - not canonical\n", pRange->szName, idMsr, uValue));
+        Log(("CPUM: wrmsr %s(%#x), %#llx -> #GP - not canonical\n", pRange->szName, idMsr, uValue));
         return VERR_CPUM_RAISE_GP_0;
     }
@@ -1432 +1432 @@
     if (!X86_IS_CANONICAL(uValue))
     {
-        Log(("CPUM: wrmsr %s(%#x), %#llx -> %#GP - not canonical\n", pRange->szName, idMsr, uValue));
+        Log(("CPUM: wrmsr %s(%#x), %#llx -> #GP - not canonical\n", pRange->szName, idMsr, uValue));
         return VERR_CPUM_RAISE_GP_0;
     }
@@ -1803 +1803 @@
     if (!X86_IS_CANONICAL(uValue))
     {
-        Log(("CPUM: wrmsr %s(%#x), %#llx -> %#GP - not canonical\n", pRange->szName, idMsr, uValue));
+        Log(("CPUM: wrmsr %s(%#x), %#llx -> #GP - not canonical\n", pRange->szName, idMsr, uValue));
         return VERR_CPUM_RAISE_GP_0;
     }
@@ -1828 +1828 @@
     if (!X86_IS_CANONICAL(uValue))
     {
-        Log(("CPUM: wrmsr %s(%#x), %#llx -> %#GP - not canonical\n", pRange->szName, idMsr, uValue));
+        Log(("CPUM: wrmsr %s(%#x), %#llx -> #GP - not canonical\n", pRange->szName, idMsr, uValue));
         return VERR_CPUM_RAISE_GP_0;
     }
@@ -4267 +4267 @@
     if (!X86_IS_CANONICAL(uValue))
     {
-        Log(("CPUM: wrmsr %s(%#x), %#llx -> %#GP - not canonical\n", pRange->szName, idMsr, uValue));
+        Log(("CPUM: wrmsr %s(%#x), %#llx -> #GP - not canonical\n", pRange->szName, idMsr, uValue));
         return VERR_CPUM_RAISE_GP_0;
     }
@@ -4340 +4340 @@
     if (!X86_IS_CANONICAL(uValue))
     {
-        Log(("CPUM: wrmsr %s(%#x), %#llx -> %#GP - not canonical\n", pRange->szName, idMsr, uValue));
+        Log(("CPUM: wrmsr %s(%#x), %#llx -> #GP - not canonical\n", pRange->szName, idMsr, uValue));
         return VERR_CPUM_RAISE_GP_0;
     }
@@ -4396 +4396 @@
     if (!X86_IS_CANONICAL(uValue))
     {
-        Log(("CPUM: wrmsr %s(%#x), %#llx -> %#GP - not canonical\n", pRange->szName, idMsr, uValue));
+        Log(("CPUM: wrmsr %s(%#x), %#llx -> #GP - not canonical\n", pRange->szName, idMsr, uValue));
         return VERR_CPUM_RAISE_GP_0;
     }

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1290 +1290 @@
     if (pLeaf)
     {
-        AssertMsg(pLeaf->uLeaf == uLeaf, ("%#x\n", pLeaf->uLeaf, uLeaf));
+        AssertMsg(pLeaf->uLeaf == uLeaf, ("%#x %#x\n", pLeaf->uLeaf, uLeaf));
         if (fExactSubLeafHit)
         {

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1163 +1163 @@
             AssertRCReturn(rc, VERR_EM_INTERPRETER);
             Log(("emInterpretIret: return to different privilege level (rpl=%d cpl=%d)\n", rpl, cpl));
-            Log(("emInterpretIret: SS:ESP=%04X:08X\n", ss, esp));
+            Log(("emInterpretIret: SS:ESP=%04x:%08x\n", ss, esp));
             pRegFrame->ss.Sel = ss;
             pRegFrame->esp    = esp;
@@ -3124 +3124 @@
     }
 
-    LogFlow(("%s %RGv=%08x eax=%08x\n", emGetMnemonic(pDis), pvParam1, pRegFrame->eax));
+    LogFlow(("%s %RGv=%p eax=%08x\n", emGetMnemonic(pDis), GCPtrPar1, pvParam1, pRegFrame->eax));
 
 #ifndef VBOX_COMPARE_IEM_AND_EM
@@ -3137 +3137 @@
 #endif /* VBOX_COMPARE_IEM_AND_EM */
 
-    LogFlow(("%s %RGv=%08x eax=%08x ZF=%d\n", emGetMnemonic(pDis), pvParam1, pRegFrame->eax, !!(eflags & X86_EFL_ZF)));
+    LogFlow(("%s %RGv=%p eax=%08x ZF=%d\n", emGetMnemonic(pDis), GCPtrPar1, pvParam1, pRegFrame->eax, !!(eflags & X86_EFL_ZF)));
 
     /* Update guest's eflags and finish; note that *only* ZF is affected. */

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -1964 +1964 @@
     if (!(NewSS & X86_SEL_MASK_OFF_RPL))
     {
-        Log(("iemMiscValidateNewSSandRsp: #x - null selector -> #TS(0)\n", NewSS));
+        Log(("iemMiscValidateNewSSandRsp: %#x - null selector -> #TS(0)\n", NewSS));
         return iemRaiseTaskSwitchFault0(pIemCpu);
     }
@@ -1987 +1987 @@
     if (!pDesc->Legacy.Gen.u1DescType)
     {
-        Log(("iemMiscValidateNewSSandRsp: %#x - system selector -> #TS\n", NewSS, pDesc->Legacy.Gen.u4Type));
+        Log(("iemMiscValidateNewSSandRsp: %#x - system selector (%#x) -> #TS\n", NewSS, pDesc->Legacy.Gen.u4Type));
         return iemRaiseTaskSwitchFaultBySelector(pIemCpu, NewSS);
     }

trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

@@ -843 +843 @@
         if ((u16 >> (Port & 7)) & ((1 << cb) - 1))
         {
-            Log(("iomInterpretCheckPortIOAccess: Port=%RTiop cb=%d u16=%#x -> #GP(0)\n",
+            Log(("iomInterpretCheckPortIOAccess: Port=%RTiop cb=%d u16=%#x (offTss=%#x) -> #GP(0)\n",
                  Port, cb, u16, offTss));
             return TRPMRaiseXcptErr(pVCpu, pCtxCore, X86_XCPT_GP, 0);

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -196 +196 @@
         } uShw;
 
-        LogFlow(("pgmPoolMonitorChainChanging: page idx=%d phys=%RGp (next=%d) kind=%s\n", pPage->idx, pPage->GCPhys, pPage->iMonitoredNext, pgmPoolPoolKindToStr(pPage->enmKind), cbWrite));
+        LogFlow(("pgmPoolMonitorChainChanging: page idx=%d phys=%RGp (next=%d) kind=%s write=%#x\n",
+                 pPage->idx, pPage->GCPhys, pPage->iMonitoredNext, pgmPoolPoolKindToStr(pPage->enmKind), cbWrite));
 
         uShw.pv = NULL;
@@ -2967 +2968 @@
 static int pgmPoolTrackAddUser(PPGMPOOL pPool, PPGMPOOLPAGE pPage, uint16_t iUser, uint32_t iUserTable)
 {
-    Log3(("pgmPoolTrackAddUser: GCPhys=%RGp iUser=%%x iUserTable=%x\n", pPage->GCPhys, iUser, iUserTable));
+    Log3(("pgmPoolTrackAddUser: GCPhys=%RGp iUser=%x iUserTable=%x\n", pPage->GCPhys, iUser, iUserTable));
     PPGMPOOLUSER paUsers = pPool->CTX_SUFF(paUsers);
     Assert(iUser != NIL_PGMPOOL_IDX);
@@ -3484 +3485 @@
 
     STAM_PROFILE_START(&pPool->StatTrackFlushGCPhysPTs, f);
-    Log2(("pgmPoolTrackFlushGCPhysPTs: pPhysPage=%RHp iPhysExt\n", PGM_PAGE_GET_HCPHYS(pPhysPage), iPhysExt));
+    Log2(("pgmPoolTrackFlushGCPhysPTs: pPhysPage=%RHp iPhysExt=%u\n", PGM_PAGE_GET_HCPHYS(pPhysPage), iPhysExt));
 
     const uint16_t iPhysExtStart = iPhysExt;

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;
         }

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

@@ -2118 +2118 @@
         {
             PCPUMCPUIDLEAF pSubLeaf = cpumR3CpuIdGetExactLeaf(pCpum, 0xd, iComponent);
-            AssertLogRelMsgReturn(pSubLeaf, ("iComponent=%#x\n"), VERR_CPUM_IPE_1);
-            AssertLogRelMsgReturn(pSubLeaf->fSubLeafMask >= iComponent, ("iComponent=%#x\n"), VERR_CPUM_IPE_1);
+            AssertLogRelMsgReturn(pSubLeaf, ("iComponent=%#x\n", iComponent), VERR_CPUM_IPE_1);
+            AssertLogRelMsgReturn(pSubLeaf->fSubLeafMask >= iComponent, ("iComponent=%#x\n", iComponent), VERR_CPUM_IPE_1);
             AssertLogRelMsgReturn(   pSubLeaf->uEax > 0
                                   && pSubLeaf->uEbx >= CPUM_MIN_XSAVE_AREA_SIZE
@@ -3117 +3117 @@
                                                   && pCurLeaf->uEbx >= CPUM_MIN_XSAVE_AREA_SIZE
                                                   && pCurLeaf->uEbx + pCurLeaf->uEax <= cbXSaveMax,
-                                                  ("%#x: eax=%#x ebx=%#x cbMax=%#x\n", pCurLeaf->uEax, pCurLeaf->uEbx, cbXSaveMax),
+                                                  ("%#x: eax=%#x ebx=%#x cbMax=%#x\n",
+                                                   uSubLeaf, pCurLeaf->uEax, pCurLeaf->uEbx, cbXSaveMax),
                                                   VERR_CPUM_IPE_2);
                             AssertLogRel(!(pCurLeaf->uEcx & 1));

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

@@ -381 +381 @@
 
         RTErrInfoSet(pErrInfo, rc, "Plug-in init failed");
-        LogRel(("DBGF: Plug-in '%s' failed during init: %Rrc\n", pPlugIn->szName));
+        LogRel(("DBGF: Plug-in '%s' failed during init: %Rrc\n", pPlugIn->szName, rc));
         RTLdrClose(pPlugIn->hLdrMod);
     }

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

@@ -2405 +2405 @@
                         HMR3ResetCpu(pVCpu);
                         pVCpu->em.s.enmState = emR3Reschedule(pVM, pVCpu, pVCpu->em.s.pCtx);
-                        Log2(("EMR3ExecuteVM: VINF_EM_TRIPLE_FAULT: %d -> %d\n", rc, enmOldState, pVCpu->em.s.enmState));
+                        Log2(("EMR3ExecuteVM: VINF_EM_TRIPLE_FAULT: %d -> %d\n", enmOldState, pVCpu->em.s.enmState));
                         break;
                     }

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

@@ -530 +530 @@
     if (!pRegion->fRegistered)
     {
-        LogFunc(("%s: Region has not been registered.\n"));
+        LogFunc(("%s: Region has not been registered.\n", pRegion->szDescription));
         return VERR_GIM_IPE_1;
     }

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

@@ -410 +410 @@
     {
         LogRel(("GIM: KVM: VCPU%3d: Invalid physical addr requested for mapping system-time struct. GCPhysSystemTime=%#RGp\n",
-                pKvmCpu->GCPhysSystemTime));
+               pVCpu->idCpu, pKvmCpu->GCPhysSystemTime));
         return VERR_GIM_OPERATION_FAILED;
     }
@@ -462 +462 @@
     }
     else
-        LogRel(("GIM: KVM: VCPU%3d: Failed to write system-time struct. at %#RGp. rc=%Rrc\n", pKvmCpu->GCPhysSystemTime, rc));
+        LogRel(("GIM: KVM: VCPU%3d: Failed to write system-time struct. at %#RGp. rc=%Rrc\n",
+                pVCpu->idCpu, pKvmCpu->GCPhysSystemTime, rc));
 
     return rc;

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

@@ -681 +681 @@
         if (!pRange)
         {
-            AssertMsgFailed(("No R3! Port=#x %#x-%#x! (%s)\n", Port, PortStart, (unsigned)PortStart + cPorts - 1, pszDesc));
+            AssertMsgFailed(("No R3! Port=%#x %#x-%#x! (%s)\n", Port, PortStart, (unsigned)PortStart + cPorts - 1, pszDesc));
             IOM_UNLOCK_EXCL(pVM);
             return VERR_IOM_NO_R3_IOPORT_RANGE;
@@ -796 +796 @@
         if (!pRange)
         {
-            AssertMsgFailed(("No R3! Port=#x %#x-%#x! (%s)\n", Port, PortStart, (unsigned)PortStart + cPorts - 1, pszDesc));
+            AssertMsgFailed(("No R3! Port=%#x %#x-%#x! (%s)\n", Port, PortStart, (unsigned)PortStart + cPorts - 1, pszDesc));
             IOM_UNLOCK_EXCL(pVM);
             return VERR_IOM_NO_R3_IOPORT_RANGE;
@@ -1467 +1467 @@
     if (!pfnWriteCallback && !pfnReadCallback)
     {
-        AssertMsgFailed(("No callbacks! %RGp LB%#x %s\n", GCPhysStart, cbRange));
+        AssertMsgFailed(("No callbacks! %RGp LB%#x\n", GCPhysStart, cbRange));
         return VERR_INVALID_PARAMETER;
     }
@@ -1526 +1526 @@
     if (!pfnWriteCallback && !pfnReadCallback)
     {
-        AssertMsgFailed(("No callbacks! %RGp LB%#x %s\n", GCPhysStart, cbRange));
+        AssertMsgFailed(("No callbacks! %RGp LB%#x\n", GCPhysStart, cbRange));
         return VERR_INVALID_PARAMETER;
     }

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

@@ -646 +646 @@
 {
     LogFlowFunc(("pEpClass=%#p pszBwMgr=%#p{%s} cbTransferPerSecMax=%u cbTransferPerSecStart=%u cbTransferPerSecStep=%u\n",
-                 pEpClass, pszBwMgr, cbTransferPerSecMax, cbTransferPerSecStart, cbTransferPerSecStep));
+                 pEpClass, pszBwMgr, pszBwMgr, cbTransferPerSecMax, cbTransferPerSecStart, cbTransferPerSecStep));
 
     AssertPtrReturn(pEpClass, VERR_INVALID_POINTER);

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

@@ -1144 +1144 @@
         RTMemFree(pBlkCacheGlobal);
 
-    LogFlowFunc((": returns rc=%Rrc\n", pVM, rc));
+    LogFlowFunc((": returns rc=%Rrc\n", rc));
     return rc;
 }

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

@@ -586 +586 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DevHlp_SSMRegister: caller='%s'/%d: uVersion=#x cbGuess=%#x pszBefore=%p:{%s}\n"
+    LogFlow(("pdmR3DevHlp_SSMRegister: caller='%s'/%d: uVersion=%#x cbGuess=%#x pszBefore=%p:{%s}\n"
              "    pfnLivePrep=%p pfnLiveExec=%p pfnLiveVote=%p pfnSavePrep=%p pfnSaveExec=%p pfnSaveDone=%p pszLoadPrep=%p pfnLoadExec=%p pfnLoadDone=%p\n",
              pDevIns->pReg->szName, pDevIns->iInstance, uVersion, cbGuess, pszBefore, pszBefore,
@@ -645 +645 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3DevHlp_TMTimeVirtGet: caller='%s'\n",
+    LogFlow(("pdmR3DevHlp_TMTimeVirtGet: caller='%s'/%d\n",
              pDevIns->pReg->szName, pDevIns->iInstance));
 
@@ -659 +659 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3DevHlp_TMTimeVirtGetFreq: caller='%s'\n",
+    LogFlow(("pdmR3DevHlp_TMTimeVirtGetFreq: caller='%s'/%d\n",
              pDevIns->pReg->szName, pDevIns->iInstance));
 
@@ -673 +673 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3DevHlp_TMTimeVirtGetNano: caller='%s'\n",
+    LogFlow(("pdmR3DevHlp_TMTimeVirtGetNano: caller='%s'/%d\n",
              pDevIns->pReg->szName, pDevIns->iInstance));
 
@@ -688 +688 @@
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3DevHlp_GetSupDrvSession: caller='%s'\n",
+    LogFlow(("pdmR3DevHlp_GetSupDrvSession: caller='%s'/%d\n",
              pDevIns->pReg->szName, pDevIns->iInstance));
 
@@ -3103 +3103 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d:\n"));
+    LogFlow(("pdmR3DevHlp_HPETRegister: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
 
     /*
@@ -3134 +3134 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     VM_ASSERT_EMT(pDevIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d:\n"));
+    LogFlow(("pdmR3DevHlp_PciRawRegister: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
 
     /*

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

@@ -314 +314 @@
         else
             rc = MMR3HeapAllocZEx(pVM, MM_TAG_PDM_DEVICE, sizeof(*pCritSect), (void **)&pCritSect);
-        AssertLogRelMsgRCReturn(rc, ("Failed to allocate a critical section for the device\n",  rc), rc);
+        AssertLogRelMsgRCReturn(rc, ("Failed to allocate a critical section for the device (%Rrc)\n",  rc), rc);
 
         /*
@@ -644 +644 @@
                     &&  strlen(pReg->szName) < sizeof(pReg->szName)
                     &&  pdmR3IsValidName(pReg->szName),
-                    ("Invalid name '%.s'\n", sizeof(pReg->szName), pReg->szName),
+                    ("Invalid name '%.*s'\n", sizeof(pReg->szName), pReg->szName),
                     VERR_PDM_INVALID_DEVICE_REGISTRATION);
     AssertMsgReturn(   !(pReg->fFlags & PDM_DEVREG_FLAGS_RC)

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

@@ -93 +93 @@
     int rc = pfnCallback(&RegCB.Core, VBOX_VERSION);
     if (RT_FAILURE(rc))
-        AssertMsgFailed(("VBoxDriversRegister failed with rc=%Rrc\n"));
+        AssertMsgFailed(("VBoxDriversRegister failed with rc=%Rrc\n", rc));
 
     return rc;
@@ -244 +244 @@
                 Log(("PDM: Successfully loaded driver module %s (%s).\n", pszName, pszFilename));
             else
-                AssertMsgFailed(("VBoxDriversRegister failed with rc=%Rrc\n"));
+                AssertMsgFailed(("VBoxDriversRegister failed with rc=%Rrc\n", rc));
         }
         else
@@ -273 +273 @@
                     ("%.*s\n", sizeof(pReg->szName), pReg->szName),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
-    AssertMsgReturn(pdmR3IsValidName(pReg->szName), ("%.*s\n", pReg->szName),
+    AssertMsgReturn(pdmR3IsValidName(pReg->szName), ("%.*s\n", sizeof(pReg->szName), pReg->szName),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(    !(pReg->fFlags & PDM_DRVREG_FLAGS_R0)
@@ -310 +310 @@
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
     AssertMsgReturn(pReg->u32VersionEnd == PDM_DRVREG_VERSION,
-                    ("%s: #x\n", pReg->szName, pReg->u32VersionEnd),
+                    ("%s: %#x\n", pReg->szName, pReg->u32VersionEnd),
                     VERR_PDM_INVALID_DRIVER_REGISTRATION);
 
@@ -1259 +1259 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     LogFlow(("pdmR3DrvHlp_PDMQueueCreate: caller='%s'/%d: cbItem=%d cItems=%d cMilliesInterval=%d pfnCallback=%p pszName=%p:{%s} ppQueue=%p\n",
-             pDrvIns->pReg->szName, pDrvIns->iInstance, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, pszName, ppQueue, ppQueue));
+             pDrvIns->pReg->szName, pDrvIns->iInstance, cbItem, cItems, cMilliesInterval, pfnCallback, pszName, pszName, ppQueue));
     PVM pVM = pDrvIns->Internal.s.pVMR3;
     VM_ASSERT_EMT(pVM);
@@ -1317 +1317 @@
     PDMDRV_ASSERT_DRVINS(pDrvIns);
     VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DrvHlp_SSMRegister: caller='%s'/%d: uVersion=#x cbGuess=%#x \n"
+    LogFlow(("pdmR3DrvHlp_SSMRegister: caller='%s'/%d: uVersion=%#x cbGuess=%#x \n"
              "    pfnLivePrep=%p pfnLiveExec=%p pfnLiveVote=%p  pfnSavePrep=%p pfnSaveExec=%p pfnSaveDone=%p pszLoadPrep=%p pfnLoadExec=%p pfnLoaddone=%p\n",
              pDrvIns->pReg->szName, pDrvIns->iInstance, uVersion, cbGuess,
@@ -1367 +1367 @@
 {
     PDMDRV_ASSERT_DRVINS(pDrvIns);
-    LogFlow(("pdmR3DrvHlp_DBGFInfoDeregister: caller='%s'/%d: pszName=%p:{%s} pszDesc=%p:{%s} pfnHandler=%p\n",
-             pDrvIns->pReg->szName, pDrvIns->iInstance, pszName));
+    LogFlow(("pdmR3DrvHlp_DBGFInfoDeregister: caller='%s'/%d: pszName=%p:{%s}\n",
+             pDrvIns->pReg->szName, pDrvIns->iInstance, pszName, pszName));
 
     int rc = DBGFR3InfoDeregisterDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, pszName);

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

@@ -234 +234 @@
         *ppQueue = pQueue;
         Log(("PDM: Created device queue %p; cbItem=%d cItems=%d cMillies=%d pfnCallback=%p pDevIns=%p\n",
-             cbItem, cItems, cMilliesInterval, pfnCallback, pDevIns));
+             pQueue, cbItem, cItems, cMilliesInterval, pfnCallback, pDevIns));
     }
     return rc;
@@ -280 +280 @@
         *ppQueue = pQueue;
         Log(("PDM: Created driver queue %p; cbItem=%d cItems=%d cMillies=%d pfnCallback=%p pDrvIns=%p\n",
-             cbItem, cItems, cMilliesInterval, pfnCallback, pDrvIns));
+             pQueue, cbItem, cItems, cMilliesInterval, pfnCallback, pDrvIns));
     }
     return rc;
@@ -325 +325 @@
         *ppQueue = pQueue;
         Log(("PDM: Created internal queue %p; cbItem=%d cItems=%d cMillies=%d pfnCallback=%p\n",
-             cbItem, cItems, cMilliesInterval, pfnCallback));
+             pQueue, cbItem, cItems, cMilliesInterval, pfnCallback));
     }
     return rc;
@@ -370 +370 @@
         *ppQueue = pQueue;
         Log(("PDM: Created external queue %p; cbItem=%d cItems=%d cMillies=%d pfnCallback=%p pvUser=%p\n",
-             cbItem, cItems, cMilliesInterval, pfnCallback, pvUser));
+             pQueue, cbItem, cItems, cMilliesInterval, pfnCallback, pvUser));
     }
     return rc;

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

@@ -225 +225 @@
                     &&  strlen(pReg->szName) < sizeof(pReg->szName)
                     &&  pdmR3IsValidName(pReg->szName),
-                    ("Invalid name '%.s'\n", sizeof(pReg->szName), pReg->szName),
+                    ("Invalid name '%.*s'\n", sizeof(pReg->szName), pReg->szName),
                     VERR_PDM_INVALID_USB_REGISTRATION);
     AssertMsgReturn((pReg->fFlags & ~(PDM_USBREG_HIGHSPEED_CAPABLE | PDM_USBREG_SUPERSPEED_CAPABLE | PDM_USBREG_SAVED_STATE_SUPPORTED)) == 0,
@@ -1389 +1389 @@
 {
     LogFlow(("PDMR3UsbDriverDetach: pszDevice=%p:{%s} iDevIns=%u iLun=%u pszDriver=%p:{%s} iOccurance=%u fFlags=%#x\n",
-             pszDevice, pszDevice, iDevIns, iLun, pszDriver, iOccurance, fFlags));
+             pszDevice, pszDevice, iDevIns, iLun, pszDriver, pszDriver, iOccurance, fFlags));
     UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
     PVM pVM = pUVM->pVM;
@@ -1689 +1689 @@
     PDMUSB_ASSERT_USBINS(pUsbIns);
     VM_ASSERT_EMT(pUsbIns->Internal.s.pVM);
-    LogFlow(("pdmR3UsbHlp_SSMRegister: caller='%s'/%d: uVersion=#x cbGuess=%#x\n"
+    LogFlow(("pdmR3UsbHlp_SSMRegister: caller='%s'/%d: uVersion=%#x cbGuess=%#x\n"
              "    pfnLivePrep=%p pfnLiveExec=%p pfnLiveVote=%p pfnSavePrep=%p pfnSaveExec=%p pfnSaveDone=%p pszLoadPrep=%p pfnLoadExec=%p pfnLoadDone=%p\n",
              pUsbIns->pReg->szName, pUsbIns->iInstance, uVersion, cbGuess,

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

@@ -159 +159 @@
 {
     LogFlow(("PGMR3HandlerPhysicalTypeRegister: enmKind=%d pfnHandlerR3=%RHv pszModR0=%s pszHandlerR0=%s pszPfHandlerR0=%s pszModRC=%s pszHandlerRC=%s pszPfHandlerRC=%s pszDesc=%s\n",
-             enmKind, pfnHandlerR3, pszModR0, pszHandlerR0, pszPfHandlerR0, pszModRC, pszHandlerRC, pszDesc, pszPfHandlerRC, pszDesc));
+             enmKind, pfnHandlerR3, pszModR0, pszHandlerR0, pszPfHandlerR0, pszModRC, pszHandlerRC, pszPfHandlerRC, pszDesc));
 
     /*

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

@@ -2527 +2527 @@
                 const uint32_t cPagesInChunk = (1*1024*1024) >> PAGE_SHIFT;
                 AssertLogRelMsgReturn(cPages % cPagesInChunk == 0,
-                                      ("cPages=%#x cPagesInChunk=%#x\n", cPages, cPagesInChunk, pRam->GCPhys, pRam->pszDesc),
+                                      ("cPages=%#x cPagesInChunk=%#x GCPhys=%RGp %s\n", cPages, cPagesInChunk, pRam->GCPhys, pRam->pszDesc),
                                       VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
 

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

@@ -1941 +1941 @@
             cbMonitoredTss = Tss.offIoBitmap;
             AssertMsgReturn(pVM->selm.s.offGuestIoBitmap == Tss.offIoBitmap,
-                            ("#x %#x\n", pVM->selm.s.offGuestIoBitmap, Tss.offIoBitmap),
+                            ("%#x %#x\n", pVM->selm.s.offGuestIoBitmap, Tss.offIoBitmap),
                             false);
 

trunk/src/VBox/VMM/VMMRC/PATMRC.cpp

@@ -114 +114 @@
             if (!pRegFrame)
             {
-                LogFlow(("PATMHandleWriteToPatchPage: Allow writing %RRv LB %#x\n", pRegFrame->eip, GCPtr, cbWrite));
+                LogFlow(("PATMHandleWriteToPatchPage: Allow %#x writing %RRv LB %#x\n", pRegFrame->eip, GCPtr, cbWrite));
                 STAM_COUNTER_INC(&pVM->patm.s.StatPatchWriteInterpreted);
                 STAM_PROFILE_ADV_STOP(&pVM->patm.s.StatPatchWriteDetect, a);
                 return VINF_PGM_HANDLER_DO_DEFAULT;
             }
-            LogFlow(("PATMHandleWriteToPatchPage: Interpret %x accessing %RRv\n", pRegFrame->eip, GCPtr));
+            LogFlow(("PATMHandleWriteToPatchPage: Interpret %#x accessing %RRv\n", pRegFrame->eip, GCPtr));
             int rc = VBOXSTRICTRC_TODO(EMInterpretInstruction(VMMGetCpu0(pVM), pRegFrame, (RTGCPTR)(RTRCUINTPTR)GCPtr));
             if (rc == VINF_SUCCESS)

trunk/src/VBox/VMM/VMMRC/SELMRC.cpp

@@ -162 +162 @@
             }
             else
-                Log(("GDT write to selector in %s register %04X (out of sync)\n", paSReg[iSReg].Sel));
+                Log(("GDT write to selector in %s register %04X (out of sync)\n", g_aszSRegNms[iSReg], paSReg[iSReg].Sel));
         }
     }

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -337 +337 @@
 
     rc = trpmGCExitTrap(pVM, pVCpu, rc, pRegFrame);
-    Log6(("TRPMGC01: %Rrc (%04x:%08x %RTreg %EFlag=%#x)\n", rc, pRegFrame->cs.Sel, pRegFrame->eip, uDr6, CPUMRawGetEFlags(pVCpu)));
+    Log6(("TRPMGC01: %Rrc (%04x:%08x %RTreg EFlag=%#x)\n", rc, pRegFrame->cs.Sel, pRegFrame->eip, uDr6, CPUMRawGetEFlags(pVCpu)));
     TRPM_EXIT_DBG_HOOK(1);
     return rc;
@@ -537 +537 @@
     PVMCPU  pVCpu = TRPMCPU_2_VMCPU(pTrpmCpu);
     int     rc;
-    LogFlow(("TRPMGC06: %04x:%08x EFL=%x\n", pRegFrame->cs.Sel, pRegFrame->eip, pRegFrame->eflags.u32, CPUMRawGetEFlags(pVCpu)));
+    LogFlow(("TRPMGC06: %04x:%08x EFL=%#x/%#x\n", pRegFrame->cs.Sel, pRegFrame->eip, pRegFrame->eflags.u32, CPUMRawGetEFlags(pVCpu)));
     TRPM_ENTER_DBG_HOOK(6);
     PGMRZDynMapStartAutoSet(pVCpu);