VirtualBox

Changeset 57211 in vbox


Ignore:
Timestamp:
Aug 6, 2015 10:08:16 AM (9 years ago)
Author:
vboxsync
Message:

VMM: LogRel nits.

Location:
trunk/src/VBox/VMM
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

    r57109 r57211  
    23602360    if ((val & zap) != val)
    23612361    {
    2362         LogRel(("hmR0VmxSetupPinCtls: invalid pin-based VM-execution controls combo! cpu=%#RX64 val=%#RX64 zap=%#RX64\n",
     2362        LogRel(("hmR0VmxSetupPinCtls: Invalid pin-based VM-execution controls combo! cpu=%#RX64 val=%#RX64 zap=%#RX64\n",
    23632363                pVM->hm.s.vmx.Msrs.VmxPinCtls.n.disallowed0, val, zap));
    23642364        pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PIN_EXEC;
    … …  
    24022402        ||  (pVM->hm.s.vmx.Msrs.VmxProcCtls.n.disallowed0 & VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT))
    24032403    {
    2404         LogRel(("hmR0VmxSetupProcCtls: unsupported VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT combo!"));
     2404        LogRel(("hmR0VmxSetupProcCtls: Unsupported VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT combo!"));
    24052405        pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PROC_MOV_DRX_EXIT;
    24062406        return VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO;
    … …  
    24832483    if ((val & zap) != val)
    24842484    {
    2485         LogRel(("hmR0VmxSetupProcCtls: invalid processor-based VM-execution controls combo! cpu=%#RX64 val=%#RX64 zap=%#RX64\n",
     2485        LogRel(("hmR0VmxSetupProcCtls: Invalid processor-based VM-execution controls combo! cpu=%#RX64 val=%#RX64 zap=%#RX64\n",
    24862486                pVM->hm.s.vmx.Msrs.VmxProcCtls.n.disallowed0, val, zap));
    24872487        pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PROC_EXEC;
    … …  
    25412541        if ((val & zap) != val)
    25422542        {
    2543             LogRel(("hmR0VmxSetupProcCtls: invalid secondary processor-based VM-execution controls combo! "
     2543            LogRel(("hmR0VmxSetupProcCtls: Invalid secondary processor-based VM-execution controls combo! "
    25442544                    "cpu=%#RX64 val=%#RX64 zap=%#RX64\n", pVM->hm.s.vmx.Msrs.VmxProcCtls2.n.disallowed0, val, zap));
    25452545            pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_PROC_EXEC2;
    … …  
    27392739             || !pVM->hm.s.vmx.pRealModeTSS))
    27402740    {
    2741         LogRel(("VMXR0SetupVM: invalid real-on-v86 state.\n"));
     2741        LogRel(("VMXR0SetupVM: Invalid real-on-v86 state.\n"));
    27422742        return VERR_INTERNAL_ERROR;
    27432743    }
    … …  
    33383338        if ((val & zap) != val)
    33393339        {
    3340             LogRel(("hmR0VmxLoadGuestEntryCtls: invalid VM-entry controls combo! cpu=%RX64 val=%RX64 zap=%RX64\n",
     3340            LogRel(("hmR0VmxLoadGuestEntryCtls: Invalid VM-entry controls combo! cpu=%RX64 val=%RX64 zap=%RX64\n",
    33413341                    pVM->hm.s.vmx.Msrs.VmxEntry.n.disallowed0, val, zap));
    33423342            pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_ENTRY;
    … …  
    34253425        if ((val & zap) != val)
    34263426        {
    3427             LogRel(("hmR0VmxSetupProcCtls: invalid VM-exit controls combo! cpu=%RX64 val=%RX64 zap=%RX64\n",
     3427            LogRel(("hmR0VmxSetupProcCtls: Invalid VM-exit controls combo! cpu=%RX64 val=%RX64 zap=%RX64\n",
    34283428                    pVM->hm.s.vmx.Msrs.VmxExit.n.disallowed0, val, zap));
    34293429            pVCpu->hm.s.u32HMError = VMX_UFC_CTRL_EXIT;

  • trunk/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp

    r57172 r57211  
    509509    if (RT_UNLIKELY(!pDbgfCoreCpu))
    510510    {
    511         LogRel((DBGFLOG_NAME ": failed to alloc %u bytes for DBGFCORECPU\n", sizeof(*pDbgfCoreCpu)));
     511        LogRel((DBGFLOG_NAME ": Failed to alloc %u bytes for DBGFCORECPU\n", sizeof(*pDbgfCoreCpu)));
    512512        return VERR_NO_MEMORY;
    513513    }

  • trunk/src/VBox/VMM/VMMR3/PDM.cpp

    r56085 r57211  
    10851085        if (RT_FAILURE(rc))
    10861086        {
    1087             LogRel(("PDMR3PowerOn: driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
     1087            LogRel(("PDMR3PowerOn: Driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
    10881088                    pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDevName, iDevInstance, rc));
    10891089            return rc;
    … …  
    11101110        if (RT_FAILURE(rc))
    11111111        {
    1112             LogRel(("PDMR3PowerOn: device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
     1112            LogRel(("PDMR3PowerOn: Device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
    11131113            return rc;
    11141114        }
    … …  
    11361136        if (RT_FAILURE(rc))
    11371137        {
    1138             LogRel(("PDMR3PowerOn: device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     1138            LogRel(("PDMR3PowerOn: Device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    11391139            return rc;
    11401140        }
    … …  
    14431443            cNsElapsed = RTTimeNanoTS() - cNsElapsed;
    14441444            if (cNsElapsed >= PDMSUSPEND_WARN_AT_NS)
    1445                 LogRel(("PDMR3Reset: device '%s'/%d took %'llu ns to reset\n",
     1445                LogRel(("PDMR3Reset: Device '%s'/%d took %'llu ns to reset\n",
    14461446                        pDevIns->pReg->szName, pDevIns->iInstance, cNsElapsed));
    14471447        }
    … …  
    17201720            cNsElapsed = RTTimeNanoTS() - cNsElapsed;
    17211721            if (cNsElapsed >= PDMSUSPEND_WARN_AT_NS)
    1722                 LogRel(("PDMR3Suspend: device '%s'/%d took %'llu ns to suspend\n",
     1722                LogRel(("PDMR3Suspend: Device '%s'/%d took %'llu ns to suspend\n",
    17231723                        pDevIns->pReg->szName, pDevIns->iInstance, cNsElapsed));
    17241724        }
    … …  
    18291829        if (RT_FAILURE(rc))
    18301830        {
    1831             LogRel(("PDMR3Resume: driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
     1831            LogRel(("PDMR3Resume: Driver '%s'/%d on LUN#%d of device '%s'/%d -> %Rrc\n",
    18321832                    pDrvIns->pReg->szName, pDrvIns->iInstance, iLun, pszDevName, iDevInstance, rc));
    18331833            return rc;
    … …  
    18541854        if (RT_FAILURE(rc))
    18551855        {
    1856             LogRel(("PDMR3Resume: device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
     1856            LogRel(("PDMR3Resume: Device '%s'/%d -> %Rrc\n", pUsbIns->pReg->szName, pUsbIns->iInstance, rc));
    18571857            return rc;
    18581858        }
    … …  
    18801880        if (RT_FAILURE(rc))
    18811881        {
    1882             LogRel(("PDMR3Resume: device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     1882            LogRel(("PDMR3Resume: Device '%s'/%d -> %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
    18831883            return rc;
    18841884        }

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

    r56985 r57211  
    480480                              ("Action='%s', valid values are 'inject', 'mergeconfig', 'replace', 'replacetree', 'remove', 'removetree'.\n", szAction),
    481481                              VERR_PDM_MISCONFIGURED_DRV_TRANSFORMATION);
    482         LogRel(("Applying '%s' to '%s'::[%s]...'%s': %s\n", szCurTransNm, pszDevice, szLun, pszThisDrv, szAction));
     482        LogRel(("PDMDriver: Applying '%s' to '%s'::[%s]...'%s': %s\n", szCurTransNm, pszDevice, szLun, pszThisDrv, szAction));
    483483        CFGMR3Dump(*ppNode);
    484484        CFGMR3Dump(pCurTrans);
    … …  
    601601            CFGMR3Dump(*ppNode);
    602602        else
    603             LogRel(("The transformation removed the driver.\n"));
     603            LogRel(("PDMDriver: The transformation removed the driver.\n"));
    604604    }
    605605
    … …  
    608608     */
    609609    if (cTransformations > 0)
    610         LogRel(("Transformations done. Applied %u driver transformations.\n", cTransformations));
     610        LogRel(("PDMDriver: Transformations done. Applied %u driver transformations.\n", cTransformations));
    611611
    612612    return rc;

  • trunk/src/VBox/VMM/VMMR3/PDMLdr.cpp

    r56287 r57211  
    573573                                    rc = pVtgHdr ? VERR_INVALID_MAGIC : VERR_INVALID_POINTER;
    574574                                if (RT_FAILURE(rc))
    575                                     LogRel(("PDM: Failed to register tracepoints for '%s': %Rrc\n", pModule->szName, rc));
     575                                    LogRel(("PDMLdr: Failed to register tracepoints for '%s': %Rrc\n", pModule->szName, rc));
    576576                            }
    577577#endif
    … …  
    718718    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
    719719    RTMemFree(pModule);
    720     LogRel(("pdmR3LoadR0U: pszName=\"%s\" rc=%Rrc szErr=\"%s\"\n", pszName, rc, ErrInfo.Core.pszMsg));
     720    LogRel(("PDMLdr: pdmR3LoadR0U: pszName=\"%s\" rc=%Rrc szErr=\"%s\"\n", pszName, rc, ErrInfo.Core.pszMsg));
    721721
    722722    /* Don't consider VERR_PDM_MODULE_NAME_CLASH and VERR_NO_MEMORY above as these are very unlikely. */
    … …  
    827827            {
    828828                AssertMsgRC(rc, ("Couldn't find symbol '%s' in module '%s'\n", pszSymbol, pszModule));
    829                 LogRel(("PDMGetSymbol: Couldn't find symbol '%s' in module '%s'\n", pszSymbol, pszModule));
     829                LogRel(("PDMLdr: PDMGetSymbol: Couldn't find symbol '%s' in module '%s'\n", pszSymbol, pszModule));
    830830            }
    831831            return rc;

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

    r56985 r57211  
    118118    if (!(pDrvIns->pReg->fClass & PDM_DRVREG_CLASS_USB))
    119119    {
    120         LogRel(("pdmR3UsbRegisterHub: fClass=%#x expected %#x to be set\n", pDrvIns->pReg->fClass, PDM_DRVREG_CLASS_USB));
     120        LogRel(("PDMUsb: pdmR3UsbRegisterHub: fClass=%#x expected %#x to be set\n", pDrvIns->pReg->fClass, PDM_DRVREG_CLASS_USB));
    121121        return VERR_INVALID_PARAMETER;
    122122    }
    … …  
    675675        }
    676676
    677         LogRel(("PDM: Failed to attach USB device '%s' instance %d to hub %p: %Rrc\n",
     677        LogRel(("PDMUsb: Failed to attach USB device '%s' instance %d to hub %p: %Rrc\n",
    678678                pUsbIns->pReg->szName, pUsbIns->iInstance, pHub, rc));
    679679    }
    … …  
    931931    if (!pUsbDev)
    932932    {
    933         LogRel(("PDMR3UsbCreateEmulatedDevice: The '%s' device wasn't found\n", pszDeviceName));
     933        LogRel(("PDMUsb: PDMR3UsbCreateEmulatedDevice: The '%s' device wasn't found\n", pszDeviceName));
    934934        return VERR_PDM_NO_USBPROXY;
    935935    }
    … …  
    10111011    if (!pUsbDev)
    10121012    {
    1013         LogRel(("PDMR3UsbCreateProxyDevice: The USBProxy device class wasn't found\n"));
     1013        LogRel(("PDMUsb: PDMR3UsbCreateProxyDevice: The USBProxy device class wasn't found\n"));
    10141014        return VERR_PDM_NO_USBPROXY;
    10151015    }
    … …  
    10481048    {
    10491049        CFGMR3RemoveNode(pInstance);
    1050         LogRel(("PDMR3UsbCreateProxyDevice: failed to setup CFGM config, rc=%Rrc\n", rc));
     1050        LogRel(("PDMUsb: PDMR3UsbCreateProxyDevice: failed to setup CFGM config, rc=%Rrc\n", rc));
    10511051        return rc;
    10521052    }
    … …  
    11981198        if (RT_FAILURE(rc))
    11991199        {
    1200             LogRel(("PDM: Failed to detach USB device '%s' instance %d from %p: %Rrc\n",
     1200            LogRel(("PDMUsb: Failed to detach USB device '%s' instance %d from %p: %Rrc\n",
    12011201                    pUsbIns->pReg->szName, pUsbIns->iInstance, pHub, rc));
    12021202            return rc;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette