summaryrefslogtreecommitdiff
path: root/src/VBox/VMM/VMMR3
diff options
context:
space:
mode:
Diffstat (limited to 'src/VBox/VMM/VMMR3')
-rw-r--r--src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp7
-rw-r--r--src/VBox/VMM/VMMR3/DBGFR3PlugIn.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/EM.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/GIM.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/GIMKvm.cpp5
-rw-r--r--src/VBox/VMM/VMMR3/IOM.cpp8
-rw-r--r--src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/PDMBlkCache.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/PDMDevHlp.cpp14
-rw-r--r--src/VBox/VMM/VMMR3/PDMDevice.cpp4
-rw-r--r--src/VBox/VMM/VMMR3/PDMDriver.cpp16
-rw-r--r--src/VBox/VMM/VMMR3/PDMQueue.cpp8
-rw-r--r--src/VBox/VMM/VMMR3/PDMUsb.cpp6
-rw-r--r--src/VBox/VMM/VMMR3/PGMHandler.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/PGMSavedState.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/SELM.cpp2
16 files changed, 43 insertions, 41 deletions
diff --git a/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp b/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp
index fab54568d07..95bf93bc6bb 100644
--- a/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp
+++ b/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp
@@ -2117,8 +2117,8 @@ static int cpumR3CpuIdInstallAndExplodeLeaves(PVM pVM, PCPUM pCpum, PCPUMCPUIDLE
if (pCpum->fXStateGuestMask & RT_BIT_64(iComponent))
{
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
&& pSubLeaf->uEax <= pCpum->GuestFeatures.cbMaxExtendedState
@@ -3116,7 +3116,8 @@ static int cpumR3CpuIdSanitize(PVM pVM, PCPUM pCpum, PCPUMCPUIDCONFIG pConfig)
&& pCurLeaf->uEbx < cbXSaveMax
&& 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));
pCurLeaf->uEcx = 0; /* Bit 0 should be zero (XCR0), the reset are reserved... */
diff --git a/src/VBox/VMM/VMMR3/DBGFR3PlugIn.cpp b/src/VBox/VMM/VMMR3/DBGFR3PlugIn.cpp
index 269aaff203f..c83385cf2f6 100644
--- a/src/VBox/VMM/VMMR3/DBGFR3PlugIn.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFR3PlugIn.cpp
@@ -380,7 +380,7 @@ static DECLCALLBACK(int) dbgfR3PlugInLoad(PUVM pUVM, const char *pszName, const
}
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);
}
MMR3HeapFree(pPlugIn);
diff --git a/src/VBox/VMM/VMMR3/EM.cpp b/src/VBox/VMM/VMMR3/EM.cpp
index 4ef7d6e15d1..2ba0a5756b6 100644
--- a/src/VBox/VMM/VMMR3/EM.cpp
+++ b/src/VBox/VMM/VMMR3/EM.cpp
@@ -2404,7 +2404,7 @@ VMMR3_INT_DECL(int) EMR3ExecuteVM(PVM pVM, PVMCPU pVCpu)
EMR3ResetCpu(pVCpu);
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;
}
/* Else fall through and trigger a guru. */
diff --git a/src/VBox/VMM/VMMR3/GIM.cpp b/src/VBox/VMM/VMMR3/GIM.cpp
index e5aa97e938b..2feb5bbe57d 100644
--- a/src/VBox/VMM/VMMR3/GIM.cpp
+++ b/src/VBox/VMM/VMMR3/GIM.cpp
@@ -529,7 +529,7 @@ VMMR3_INT_DECL(int) GIMR3Mmio2Map(PVM pVM, PGIMMMIO2REGION pRegion, RTGCPHYS GCP
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;
}
diff --git a/src/VBox/VMM/VMMR3/GIMKvm.cpp b/src/VBox/VMM/VMMR3/GIMKvm.cpp
index ad6a8cb9efa..2f96d36e86c 100644
--- a/src/VBox/VMM/VMMR3/GIMKvm.cpp
+++ b/src/VBox/VMM/VMMR3/GIMKvm.cpp
@@ -409,7 +409,7 @@ VMMR3_INT_DECL(int) gimR3KvmEnableSystemTime(PVM pVM, PVMCPU pVCpu)
if (!PGMPhysIsGCPhysNormal(pVM, pKvmCpu->GCPhysSystemTime))
{
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;
}
@@ -461,7 +461,8 @@ VMMR3_INT_DECL(int) gimR3KvmEnableSystemTime(PVM pVM, PVMCPU pVCpu)
TMR3CpuTickParavirtEnable(pVM);
}
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;
}
diff --git a/src/VBox/VMM/VMMR3/IOM.cpp b/src/VBox/VMM/VMMR3/IOM.cpp
index f01f9ca5907..4370c7966ba 100644
--- a/src/VBox/VMM/VMMR3/IOM.cpp
+++ b/src/VBox/VMM/VMMR3/IOM.cpp
@@ -680,7 +680,7 @@ VMMR3_INT_DECL(int) IOMR3IOPortRegisterRC(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT
PIOMIOPORTRANGER3 pRange = (PIOMIOPORTRANGER3)RTAvlroIOPortRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->IOPortTreeR3, Port);
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;
}
@@ -795,7 +795,7 @@ VMMR3_INT_DECL(int) IOMR3IOPortRegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT
PIOMIOPORTRANGER3 pRange = (PIOMIOPORTRANGER3)RTAvlroIOPortRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->IOPortTreeR3, Port);
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;
}
@@ -1466,7 +1466,7 @@ IOMR3MmioRegisterRC(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t
*/
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;
}
PVMCPU pVCpu = VMMGetCpu(pVM); Assert(pVCpu);
@@ -1525,7 +1525,7 @@ IOMR3MmioRegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, uint32_t
*/
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;
}
PVMCPU pVCpu = VMMGetCpu(pVM); Assert(pVCpu);
diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp
index 8e213802285..deb80ec02cf 100644
--- a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp
+++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp
@@ -645,7 +645,7 @@ static int pdmacAsyncCompletionBwMgrCreate(PPDMASYNCCOMPLETIONEPCLASS pEpClass,
uint32_t cbTransferPerSecStart, uint32_t cbTransferPerSecStep)
{
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);
AssertPtrReturn(pszBwMgr, VERR_INVALID_POINTER);
diff --git a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp
index 6f8d520f8b2..188c4968e16 100644
--- a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp
+++ b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp
@@ -1143,7 +1143,7 @@ int pdmR3BlkCacheInit(PVM pVM)
if (pBlkCacheGlobal)
RTMemFree(pBlkCacheGlobal);
- LogFlowFunc((": returns rc=%Rrc\n", pVM, rc));
+ LogFlowFunc((": returns rc=%Rrc\n", rc));
return rc;
}
diff --git a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
index 575a6a59fef..ecd9731e463 100644
--- a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
+++ b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp
@@ -585,7 +585,7 @@ static DECLCALLBACK(int) pdmR3DevHlp_SSMRegister(PPDMDEVINS pDevIns, uint32_t uV
{
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,
pfnLivePrep, pfnLiveExec, pfnLiveVote,
@@ -644,7 +644,7 @@ static DECLCALLBACK(PRTTIMESPEC) pdmR3DevHlp_TMUtcNow(PPDMDEVINS pDevIns, PRTTIM
static DECLCALLBACK(uint64_t) pdmR3DevHlp_TMTimeVirtGet(PPDMDEVINS pDevIns)
{
PDMDEV_ASSERT_DEVINS(pDevIns);
- LogFlow(("pdmR3DevHlp_TMTimeVirtGet: caller='%s'\n",
+ LogFlow(("pdmR3DevHlp_TMTimeVirtGet: caller='%s'/%d\n",
pDevIns->pReg->szName, pDevIns->iInstance));
uint64_t u64Time = TMVirtualSyncGet(pDevIns->Internal.s.pVMR3);
@@ -658,7 +658,7 @@ static DECLCALLBACK(uint64_t) pdmR3DevHlp_TMTimeVirtGet(PPDMDEVINS pDevIns)
static DECLCALLBACK(uint64_t) pdmR3DevHlp_TMTimeVirtGetFreq(PPDMDEVINS pDevIns)
{
PDMDEV_ASSERT_DEVINS(pDevIns);
- LogFlow(("pdmR3DevHlp_TMTimeVirtGetFreq: caller='%s'\n",
+ LogFlow(("pdmR3DevHlp_TMTimeVirtGetFreq: caller='%s'/%d\n",
pDevIns->pReg->szName, pDevIns->iInstance));
uint64_t u64Freq = TMVirtualGetFreq(pDevIns->Internal.s.pVMR3);
@@ -672,7 +672,7 @@ static DECLCALLBACK(uint64_t) pdmR3DevHlp_TMTimeVirtGetFreq(PPDMDEVINS pDevIns)
static DECLCALLBACK(uint64_t) pdmR3DevHlp_TMTimeVirtGetNano(PPDMDEVINS pDevIns)
{
PDMDEV_ASSERT_DEVINS(pDevIns);
- LogFlow(("pdmR3DevHlp_TMTimeVirtGetNano: caller='%s'\n",
+ LogFlow(("pdmR3DevHlp_TMTimeVirtGetNano: caller='%s'/%d\n",
pDevIns->pReg->szName, pDevIns->iInstance));
uint64_t u64Time = TMVirtualGet(pDevIns->Internal.s.pVMR3);
@@ -687,7 +687,7 @@ static DECLCALLBACK(uint64_t) pdmR3DevHlp_TMTimeVirtGetNano(PPDMDEVINS pDevIns)
static DECLCALLBACK(PSUPDRVSESSION) pdmR3DevHlp_GetSupDrvSession(PPDMDEVINS pDevIns)
{
PDMDEV_ASSERT_DEVINS(pDevIns);
- LogFlow(("pdmR3DevHlp_GetSupDrvSession: caller='%s'\n",
+ LogFlow(("pdmR3DevHlp_GetSupDrvSession: caller='%s'/%d\n",
pDevIns->pReg->szName, pDevIns->iInstance));
PSUPDRVSESSION pSession = pDevIns->Internal.s.pVMR3->pSession;
@@ -3102,7 +3102,7 @@ static DECLCALLBACK(int) pdmR3DevHlp_HPETRegister(PPDMDEVINS pDevIns, PPDMHPETRE
{
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));
/*
* Validate input.
@@ -3133,7 +3133,7 @@ static DECLCALLBACK(int) pdmR3DevHlp_PciRawRegister(PPDMDEVINS pDevIns, PPDMPCIR
{
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));
/*
* Validate input.
diff --git a/src/VBox/VMM/VMMR3/PDMDevice.cpp b/src/VBox/VMM/VMMR3/PDMDevice.cpp
index 8cc6d8380db..4220c021af5 100644
--- a/src/VBox/VMM/VMMR3/PDMDevice.cpp
+++ b/src/VBox/VMM/VMMR3/PDMDevice.cpp
@@ -313,7 +313,7 @@ int pdmR3DevInit(PVM pVM)
rc = MMHyperAlloc(pVM, sizeof(*pCritSect), 0, MM_TAG_PDM_DEVICE, (void **)&pCritSect);
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);
/*
* Initialize it.
@@ -643,7 +643,7 @@ static DECLCALLBACK(int) pdmR3DevReg_Register(PPDMDEVREGCB pCallbacks, PCPDMDEVR
AssertMsgReturn( pReg->szName[0]
&& 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)
|| ( pReg->szRCMod[0]
diff --git a/src/VBox/VMM/VMMR3/PDMDriver.cpp b/src/VBox/VMM/VMMR3/PDMDriver.cpp
index dc917bda5f5..9bf838ec3af 100644
--- a/src/VBox/VMM/VMMR3/PDMDriver.cpp
+++ b/src/VBox/VMM/VMMR3/PDMDriver.cpp
@@ -92,7 +92,7 @@ VMMR3DECL(int) PDMR3DrvStaticRegistration(PVM pVM, FNPDMVBOXDRIVERSREGISTER pfnC
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;
}
@@ -243,7 +243,7 @@ static int pdmR3DrvLoad(PVM pVM, PPDMDRVREGCBINT pRegCB, const char *pszFilename
if (RT_SUCCESS(rc))
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
{
@@ -272,7 +272,7 @@ static DECLCALLBACK(int) pdmR3DrvRegister(PCPDMDRVREGCB pCallbacks, PCPDMDRVREG
AssertMsgReturn(RTStrEnd(pReg->szName, sizeof(pReg->szName)),
("%.*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)
|| ( pReg->szR0Mod[0]
@@ -309,7 +309,7 @@ static DECLCALLBACK(int) pdmR3DrvRegister(PCPDMDRVREGCB pCallbacks, PCPDMDRVREG
("%s: %p\n", pReg->szName, pReg->pfnSoftReset),
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);
/*
@@ -1258,7 +1258,7 @@ static DECLCALLBACK(int) pdmR3DrvHlp_QueueCreate(PPDMDRVINS pDrvIns, uint32_t cb
{
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);
@@ -1316,7 +1316,7 @@ static DECLCALLBACK(int) pdmR3DrvHlp_SSMRegister(PPDMDRVINS pDrvIns, uint32_t uV
{
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,
pfnLivePrep, pfnLiveExec, pfnLiveVote,
@@ -1366,8 +1366,8 @@ static DECLCALLBACK(int) pdmR3DrvHlp_DBGFInfoRegister(PPDMDRVINS pDrvIns, const
static DECLCALLBACK(int) pdmR3DrvHlp_DBGFInfoDeregister(PPDMDRVINS pDrvIns, const char *pszName)
{
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);
diff --git a/src/VBox/VMM/VMMR3/PDMQueue.cpp b/src/VBox/VMM/VMMR3/PDMQueue.cpp
index c1662b4ccdf..df6ad544893 100644
--- a/src/VBox/VMM/VMMR3/PDMQueue.cpp
+++ b/src/VBox/VMM/VMMR3/PDMQueue.cpp
@@ -233,7 +233,7 @@ VMMR3_INT_DECL(int) PDMR3QueueCreateDevice(PVM pVM, PPDMDEVINS pDevIns, size_t c
*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;
}
@@ -279,7 +279,7 @@ VMMR3_INT_DECL(int) PDMR3QueueCreateDriver(PVM pVM, PPDMDRVINS pDrvIns, size_t c
*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;
}
@@ -324,7 +324,7 @@ VMMR3_INT_DECL(int) PDMR3QueueCreateInternal(PVM pVM, size_t cbItem, uint32_t cI
*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;
}
@@ -369,7 +369,7 @@ VMMR3_INT_DECL(int) PDMR3QueueCreateExternal(PVM pVM, size_t cbItem, uint32_t cI
*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;
}
diff --git a/src/VBox/VMM/VMMR3/PDMUsb.cpp b/src/VBox/VMM/VMMR3/PDMUsb.cpp
index 32587f4ba9b..b4095f94e8f 100644
--- a/src/VBox/VMM/VMMR3/PDMUsb.cpp
+++ b/src/VBox/VMM/VMMR3/PDMUsb.cpp
@@ -224,7 +224,7 @@ static DECLCALLBACK(int) pdmR3UsbReg_Register(PCPDMUSBREGCB pCallbacks, PCPDMUSB
AssertMsgReturn( pReg->szName[0]
&& 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,
("fFlags=%#x\n", pReg->fFlags), VERR_PDM_INVALID_USB_REGISTRATION);
@@ -1388,7 +1388,7 @@ VMMR3DECL(int) PDMR3UsbDriverDetach(PUVM pUVM, const char *pszDevice, unsigned
const char *pszDriver, unsigned iOccurance, uint32_t fFlags)
{
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;
VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
@@ -1688,7 +1688,7 @@ static DECLCALLBACK(int) pdmR3UsbHlp_SSMRegister(PPDMUSBINS pUsbIns, uint32_t uV
{
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,
pfnLivePrep, pfnLiveExec, pfnLiveVote,
diff --git a/src/VBox/VMM/VMMR3/PGMHandler.cpp b/src/VBox/VMM/VMMR3/PGMHandler.cpp
index 792dff6d700..2c486787e91 100644
--- a/src/VBox/VMM/VMMR3/PGMHandler.cpp
+++ b/src/VBox/VMM/VMMR3/PGMHandler.cpp
@@ -158,7 +158,7 @@ VMMR3DECL(int) PGMR3HandlerPhysicalTypeRegister(PVM pVM, PGMPHYSHANDLERKIND enmK
const char *pszDesc, PPGMPHYSHANDLERTYPE phType)
{
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));
/*
* Validate input.
diff --git a/src/VBox/VMM/VMMR3/PGMSavedState.cpp b/src/VBox/VMM/VMMR3/PGMSavedState.cpp
index 72609a8a10a..910daea0749 100644
--- a/src/VBox/VMM/VMMR3/PGMSavedState.cpp
+++ b/src/VBox/VMM/VMMR3/PGMSavedState.cpp
@@ -2526,7 +2526,7 @@ static int pgmR3LoadMemoryOld(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion)
*/
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);
for (uint32_t iPage = 0; iPage < cPages; /* incremented by inner loop */ )
diff --git a/src/VBox/VMM/VMMR3/SELM.cpp b/src/VBox/VMM/VMMR3/SELM.cpp
index 4fe73963fd6..4966522d90a 100644
--- a/src/VBox/VMM/VMMR3/SELM.cpp
+++ b/src/VBox/VMM/VMMR3/SELM.cpp
@@ -1940,7 +1940,7 @@ VMMR3DECL(bool) SELMR3CheckTSS(PVM pVM)
{
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);
/* check the bitmap */
View Lorry Controller Status