summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/VBox/VMM/VMMR0/HMVMXR0.cpp14
-rw-r--r--src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp2
-rw-r--r--src/VBox/VMM/VMMR3/PDM.cpp16
-rw-r--r--src/VBox/VMM/VMMR3/PDMDriver.cpp6
-rw-r--r--src/VBox/VMM/VMMR3/PDMLdr.cpp6
-rw-r--r--src/VBox/VMM/VMMR3/PDMUsb.cpp12
6 files changed, 28 insertions, 28 deletions
diff --git a/src/VBox/VMM/VMMR0/HMVMXR0.cpp b/src/VBox/VMM/VMMR0/HMVMXR0.cpp
index 2761a7f45ff..3446b7a649d 100644
--- a/src/VBox/VMM/VMMR0/HMVMXR0.cpp
+++ b/src/VBox/VMM/VMMR0/HMVMXR0.cpp
@@ -2359,7 +2359,7 @@ static int hmR0VmxSetupPinCtls(PVM pVM, PVMCPU pVCpu)
if ((val & zap) != val)
{
- LogRel(("hmR0VmxSetupPinCtls: invalid pin-based VM-execution controls combo! cpu=%#RX64 val=%#RX64 zap=%#RX64\n",
+ LogRel(("hmR0VmxSetupPinCtls: Invalid pin-based VM-execution controls combo! cpu=%#RX64 val=%#RX64 zap=%#RX64\n",
pVM->hm.s.vmx.Msrs.VmxPinCtls.n.disallowed0, val, zap));
pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PIN_EXEC;
return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
@@ -2401,7 +2401,7 @@ static int hmR0VmxSetupProcCtls(PVM pVM, PVMCPU pVCpu)
if ( !(pVM->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT)
|| (pVM->hm.s.vmx.Msrs.VmxProcCtls.n.disallowed0 & VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT))
{
- LogRel(("hmR0VmxSetupProcCtls: unsupported VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT combo!"));
+ LogRel(("hmR0VmxSetupProcCtls: Unsupported VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT combo!"));
pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PROC_MOV_DRX_EXIT;
return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
}
@@ -2482,7 +2482,7 @@ static int hmR0VmxSetupProcCtls(PVM pVM, PVMCPU pVCpu)
if ((val & zap) != val)
{
- LogRel(("hmR0VmxSetupProcCtls: invalid processor-based VM-execution controls combo! cpu=%#RX64 val=%#RX64 zap=%#RX64\n",
+ LogRel(("hmR0VmxSetupProcCtls: Invalid processor-based VM-execution controls combo! cpu=%#RX64 val=%#RX64 zap=%#RX64\n",
pVM->hm.s.vmx.Msrs.VmxProcCtls.n.disallowed0, val, zap));
pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PROC_EXEC;
return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
@@ -2540,7 +2540,7 @@ static int hmR0VmxSetupProcCtls(PVM pVM, PVMCPU pVCpu)
if ((val & zap) != val)
{
- LogRel(("hmR0VmxSetupProcCtls: invalid secondary processor-based VM-execution controls combo! "
+ LogRel(("hmR0VmxSetupProcCtls: Invalid secondary processor-based VM-execution controls combo! "
"cpu=%#RX64 val=%#RX64 zap=%#RX64\n", pVM->hm.s.vmx.Msrs.VmxProcCtls2.n.disallowed0, val, zap));
pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PROC_EXEC2;
return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
@@ -2738,7 +2738,7 @@ VMMR0DECL(int) VMXR0SetupVM(PVM pVM)
&& ( !pVM->hm.s.vmx.pNonPagingModeEPTPageTable
|| !pVM->hm.s.vmx.pRealModeTSS))
{
- LogRel(("VMXR0SetupVM: invalid real-on-v86 state.\n"));
+ LogRel(("VMXR0SetupVM: Invalid real-on-v86 state.\n"));
return VERR_INTERNAL_ERROR;
}
@@ -3337,7 +3337,7 @@ DECLINLINE(int) hmR0VmxLoadGuestEntryCtls(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
if ((val & zap) != val)
{
- LogRel(("hmR0VmxLoadGuestEntryCtls: invalid VM-entry controls combo! cpu=%RX64 val=%RX64 zap=%RX64\n",
+ LogRel(("hmR0VmxLoadGuestEntryCtls: Invalid VM-entry controls combo! cpu=%RX64 val=%RX64 zap=%RX64\n",
pVM->hm.s.vmx.Msrs.VmxEntry.n.disallowed0, val, zap));
pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_ENTRY;
return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
@@ -3424,7 +3424,7 @@ DECLINLINE(int) hmR0VmxLoadGuestExitCtls(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
if ((val & zap) != val)
{
- LogRel(("hmR0VmxSetupProcCtls: invalid VM-exit controls combo! cpu=%RX64 val=%RX64 zap=%RX64\n",
+ LogRel(("hmR0VmxSetupProcCtls: Invalid VM-exit controls combo! cpu=%RX64 val=%RX64 zap=%RX64\n",
pVM->hm.s.vmx.Msrs.VmxExit.n.disallowed0, val, zap));
pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_EXIT;
return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
diff --git a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp
index 39b1917c04e..7bb75521764 100644
--- a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp
+++ b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp
@@ -508,7 +508,7 @@ static int dbgfR3CoreWriteWorker(PVM pVM, RTFILE hFile)
PDBGFCORECPU pDbgfCoreCpu = (PDBGFCORECPU)RTMemAlloc(sizeof(*pDbgfCoreCpu));
if (RT_UNLIKELY(!pDbgfCoreCpu))
{
- LogRel((DBGFLOG_NAME ": failed to alloc %u bytes for DBGFCORECPU\n", sizeof(*pDbgfCoreCpu)));
+ LogRel((DBGFLOG_NAME ": Failed to alloc %u bytes for DBGFCORECPU\n", sizeof(*pDbgfCoreCpu)));
return VERR_NO_MEMORY;
}
diff --git a/src/VBox/VMM/VMMR3/PDM.cpp b/src/VBox/VMM/VMMR3/PDM.cpp
index ae2b8b2f9fc..e77c10c10b5 100644
--- a/src/VBox/VMM/VMMR3/PDM.cpp
+++ b/src/VBox/VMM/VMMR3/PDM.cpp
@@ -1084,7 +1084,7 @@ DECLINLINE(int) pdmR3PowerOnDrv(PPDMDRVINS pDrvIns, const char *pszDevName, uint
int rc = VINF_SUCCESS; pDrvIns->pReg->pfnPowerOn(pDrvIns);
if (RT_FAILURE(rc))
{
- LogRel(("PDMR3PowerOn: driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
+ LogRel(("PDMR3PowerOn: Driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDevName, iDevInstance, rc));
return rc;
}
@@ -1109,7 +1109,7 @@ DECLINLINE(int) pdmR3PowerOnUsb(PPDMUSBINS pUsbIns)
int rc = VINF_SUCCESS; pUsbIns->pReg->pfnVMPowerOn(pUsbIns);
if (RT_FAILURE(rc))
{
- LogRel(("PDMR3PowerOn: device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
+ LogRel(("PDMR3PowerOn: Device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
return rc;
}
}
@@ -1135,7 +1135,7 @@ DECLINLINE(int) pdmR3PowerOnDev(PPDMDEVINS pDevIns)
PDMCritSectLeave(pDevIns->pCritSectRoR3);
if (RT_FAILURE(rc))
{
- LogRel(("PDMR3PowerOn: device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
+ LogRel(("PDMR3PowerOn: Device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
return rc;
}
}
@@ -1442,7 +1442,7 @@ DECLINLINE(void) pdmR3ResetDev(PPDMDEVINS pDevIns, PPDMNOTIFYASYNCSTATS pAsync)
PDMCritSectLeave(pDevIns->pCritSectRoR3);
cNsElapsed = RTTimeNanoTS() - cNsElapsed;
if (cNsElapsed >= PDMSUSPEND_WARN_AT_NS)
- LogRel(("PDMR3Reset: device '%s'/%d took %'llu ns to reset\n",
+ LogRel(("PDMR3Reset: Device '%s'/%d took %'llu ns to reset\n",
pDevIns->pReg->szName, pDevIns->iInstance, cNsElapsed));
}
}
@@ -1719,7 +1719,7 @@ DECLINLINE(void) pdmR3SuspendDev(PPDMDEVINS pDevIns, PPDMNOTIFYASYNCSTATS pAsync
PDMCritSectLeave(pDevIns->pCritSectRoR3);
cNsElapsed = RTTimeNanoTS() - cNsElapsed;
if (cNsElapsed >= PDMSUSPEND_WARN_AT_NS)
- LogRel(("PDMR3Suspend: device '%s'/%d took %'llu ns to suspend\n",
+ LogRel(("PDMR3Suspend: Device '%s'/%d took %'llu ns to suspend\n",
pDevIns->pReg->szName, pDevIns->iInstance, cNsElapsed));
}
}
@@ -1828,7 +1828,7 @@ DECLINLINE(int) pdmR3ResumeDrv(PPDMDRVINS pDrvIns, const char *pszDevName, uint3
int rc = VINF_SUCCESS; pDrvIns->pReg->pfnResume(pDrvIns);
if (RT_FAILURE(rc))
{
- LogRel(("PDMR3Resume: driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
+ LogRel(("PDMR3Resume: Driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDevName, iDevInstance, rc));
return rc;
}
@@ -1853,7 +1853,7 @@ DECLINLINE(int) pdmR3ResumeUsb(PPDMUSBINS pUsbIns)
int rc = VINF_SUCCESS; pUsbIns->pReg->pfnVMResume(pUsbIns);
if (RT_FAILURE(rc))
{
- LogRel(("PDMR3Resume: device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
+ LogRel(("PDMR3Resume: Device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
return rc;
}
}
@@ -1879,7 +1879,7 @@ DECLINLINE(int) pdmR3ResumeDev(PPDMDEVINS pDevIns)
PDMCritSectLeave(pDevIns->pCritSectRoR3);
if (RT_FAILURE(rc))
{
- LogRel(("PDMR3Resume: device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
+ LogRel(("PDMR3Resume: Device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
return rc;
}
}
diff --git a/src/VBox/VMM/VMMR3/PDMDriver.cpp b/src/VBox/VMM/VMMR3/PDMDriver.cpp
index 9bf838ec3af..bedafdd951b 100644
--- a/src/VBox/VMM/VMMR3/PDMDriver.cpp
+++ b/src/VBox/VMM/VMMR3/PDMDriver.cpp
@@ -479,7 +479,7 @@ static int pdmR3DrvMaybeTransformChain(PVM pVM, PPDMDRVINS pDrvAbove, PPDMLUN pL
,
("Action='%s', valid values are 'inject', 'mergeconfig', 'replace', 'replacetree', 'remove', 'removetree'.\n", szAction),
VERR_PDM_MISCONFIGURED_DRV_TRANSFORMATION);
- LogRel(("Applying '%s' to '%s'::[%s]...'%s': %s\n", szCurTransNm, pszDevice, szLun, pszThisDrv, szAction));
+ LogRel(("PDMDriver: Applying '%s' to '%s'::[%s]...'%s': %s\n", szCurTransNm, pszDevice, szLun, pszThisDrv, szAction));
CFGMR3Dump(*ppNode);
CFGMR3Dump(pCurTrans);
@@ -600,14 +600,14 @@ static int pdmR3DrvMaybeTransformChain(PVM pVM, PPDMDRVINS pDrvAbove, PPDMLUN pL
if (*ppNode)
CFGMR3Dump(*ppNode);
else
- LogRel(("The transformation removed the driver.\n"));
+ LogRel(("PDMDriver: The transformation removed the driver.\n"));
}
/*
* Note what happened in the release log.
*/
if (cTransformations > 0)
- LogRel(("Transformations done. Applied %u driver transformations.\n", cTransformations));
+ LogRel(("PDMDriver: Transformations done. Applied %u driver transformations.\n", cTransformations));
return rc;
}
diff --git a/src/VBox/VMM/VMMR3/PDMLdr.cpp b/src/VBox/VMM/VMMR3/PDMLdr.cpp
index df9bc305b72..15d57759093 100644
--- a/src/VBox/VMM/VMMR3/PDMLdr.cpp
+++ b/src/VBox/VMM/VMMR3/PDMLdr.cpp
@@ -572,7 +572,7 @@ VMMR3DECL(int) PDMR3LdrLoadRC(PVM pVM, const char *pszFilename, const char *pszN
else
rc = pVtgHdr ? VERR_INVALID_MAGIC : VERR_INVALID_POINTER;
if (RT_FAILURE(rc))
- LogRel(("PDM: Failed to register tracepoints for '%s': %Rrc\n", pModule->szName, rc));
+ LogRel(("PDMLdr: Failed to register tracepoints for '%s': %Rrc\n", pModule->szName, rc));
}
#endif
@@ -717,7 +717,7 @@ static int pdmR3LoadR0U(PUVM pUVM, const char *pszFilename, const char *pszName,
RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
RTMemFree(pModule);
- LogRel(("pdmR3LoadR0U: pszName=\"%s\" rc=%Rrc szErr=\"%s\"\n", pszName, rc, ErrInfo.Core.pszMsg));
+ LogRel(("PDMLdr: pdmR3LoadR0U: pszName=\"%s\" rc=%Rrc szErr=\"%s\"\n", pszName, rc, ErrInfo.Core.pszMsg));
/* Don't consider VERR_PDM_MODULE_NAME_CLASH and VERR_NO_MEMORY above as these are very unlikely. */
if (RT_FAILURE(rc) && pUVM->pVM) /** @todo VMR3SetErrorU. */
@@ -826,7 +826,7 @@ VMMR3DECL(int) PDMR3LdrGetSymbolR0(PVM pVM, const char *pszModule, const char *p
if (RT_FAILURE(rc))
{
AssertMsgRC(rc, ("Couldn't find symbol '%s' in module '%s'\n", pszSymbol, pszModule));
- LogRel(("PDMGetSymbol: Couldn't find symbol '%s' in module '%s'\n", pszSymbol, pszModule));
+ LogRel(("PDMLdr: PDMGetSymbol: Couldn't find symbol '%s' in module '%s'\n", pszSymbol, pszModule));
}
return rc;
}
diff --git a/src/VBox/VMM/VMMR3/PDMUsb.cpp b/src/VBox/VMM/VMMR3/PDMUsb.cpp
index b4095f94e8f..17a50a87804 100644
--- a/src/VBox/VMM/VMMR3/PDMUsb.cpp
+++ b/src/VBox/VMM/VMMR3/PDMUsb.cpp
@@ -117,7 +117,7 @@ int pdmR3UsbRegisterHub(PVM pVM, PPDMDRVINS pDrvIns, uint32_t fVersions, uint32_
/* The driver must be in the USB class. */
if (!(pDrvIns->pReg->fClass & PDM_DRVREG_CLASS_USB))
{
- LogRel(("pdmR3UsbRegisterHub: fClass=%#x expected %#x to be set\n", pDrvIns->pReg->fClass, PDM_DRVREG_CLASS_USB));
+ LogRel(("PDMUsb: pdmR3UsbRegisterHub: fClass=%#x expected %#x to be set\n", pDrvIns->pReg->fClass, PDM_DRVREG_CLASS_USB));
return VERR_INVALID_PARAMETER;
}
AssertMsgReturn(!(fVersions & ~(VUSB_STDVER_11 | VUSB_STDVER_20 | VUSB_STDVER_30)), ("%#x\n", fVersions), VERR_INVALID_PARAMETER);
@@ -674,7 +674,7 @@ static int pdmR3UsbCreateDevice(PVM pVM, PPDMUSBHUB pHub, PPDMUSB pUsbDev, int i
return VINF_SUCCESS;
}
- LogRel(("PDM: Failed to attach USB device '%s' instance %d to hub %p: %Rrc\n",
+ LogRel(("PDMUsb: Failed to attach USB device '%s' instance %d to hub %p: %Rrc\n",
pUsbIns->pReg->szName, pUsbIns->iInstance, pHub, rc));
}
else
@@ -930,7 +930,7 @@ VMMR3DECL(int) PDMR3UsbCreateEmulatedDevice(PUVM pUVM, const char *pszDeviceName
PPDMUSB pUsbDev = pdmR3UsbLookup(pVM, pszDeviceName);
if (!pUsbDev)
{
- LogRel(("PDMR3UsbCreateEmulatedDevice: The '%s' device wasn't found\n", pszDeviceName));
+ LogRel(("PDMUsb: PDMR3UsbCreateEmulatedDevice: The '%s' device wasn't found\n", pszDeviceName));
return VERR_PDM_NO_USBPROXY;
}
@@ -1010,7 +1010,7 @@ VMMR3DECL(int) PDMR3UsbCreateProxyDevice(PUVM pUVM, PCRTUUID pUuid, bool fRemote
PPDMUSB pUsbDev = pdmR3UsbLookup(pVM, "USBProxy");
if (!pUsbDev)
{
- LogRel(("PDMR3UsbCreateProxyDevice: The USBProxy device class wasn't found\n"));
+ LogRel(("PDMUsb: PDMR3UsbCreateProxyDevice: The USBProxy device class wasn't found\n"));
return VERR_PDM_NO_USBPROXY;
}
@@ -1047,7 +1047,7 @@ VMMR3DECL(int) PDMR3UsbCreateProxyDevice(PUVM pUVM, PCRTUUID pUuid, bool fRemote
if (RT_FAILURE(rc))
{
CFGMR3RemoveNode(pInstance);
- LogRel(("PDMR3UsbCreateProxyDevice: failed to setup CFGM config, rc=%Rrc\n", rc));
+ LogRel(("PDMUsb: PDMR3UsbCreateProxyDevice: failed to setup CFGM config, rc=%Rrc\n", rc));
return rc;
}
@@ -1197,7 +1197,7 @@ VMMR3DECL(int) PDMR3UsbDetachDevice(PUVM pUVM, PCRTUUID pUuid)
int rc = pHub->Reg.pfnDetachDevice(pHub->pDrvIns, pUsbIns, pUsbIns->Internal.s.iPort);
if (RT_FAILURE(rc))
{
- LogRel(("PDM: Failed to detach USB device '%s' instance %d from %p: %Rrc\n",
+ LogRel(("PDMUsb: Failed to detach USB device '%s' instance %d from %p: %Rrc\n",
pUsbIns->pReg->szName, pUsbIns->iInstance, pHub, rc));
return rc;
}
View Lorry Controller Status