VirtualBox

儲存庫 vbox 的更動 56992


忽略:
時間撮記:
2015-7-18 下午11:01:44 (9 年 以前)
作者:
vboxsync
訊息:

Devices: Log & Assertion formatting fixes.

位置:
trunk/src/VBox/Devices
檔案:
修改 21 筆資料

圖例:

未更動
新增
刪除

  • trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp

    r56838 r56992  
    23552355#define CODECDBG_UNINDENT if (pInfo->uLevel) pInfo->uLevel--;
    23562356
    2357 #define CODECDBG_PRINT(x, ...)  pInfo->pHlp->pfnPrintf(pInfo->pHlp, x);
    2358 #define CODECDBG_PRINTI(x, ...) codecDbgPrintf(pInfo, x);
     2357#define CODECDBG_PRINT(...)  pInfo->pHlp->pfnPrintf(pInfo->pHlp, __VA_ARGS__)
     2358#define CODECDBG_PRINTI(...) codecDbgPrintf(pInfo, __VA_ARGS__)
    23592359
    23602360static void codecDbgPrintfIndentV(PCODECDBGINFO pInfo, uint16_t uIndent, const char *pszFormat, va_list va)
    … …  
    24442444    if (pNode->node.id == STAC9220_NID_ROOT)
    24452445    {
    2446         CODECDBG_PRINT("ROOT\n")
     2446        CODECDBG_PRINT("ROOT\n");
    24472447    }
    24482448    else if (pNode->node.id == STAC9220_NID_AFG)
    24492449    {
    2450         CODECDBG_PRINT("AFG\n")
     2450        CODECDBG_PRINT("AFG\n");
    24512451        CODECDBG_INDENT
    24522452            codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
    … …  
    24562456    else if (hdaCodecIsPortNode(pInfo->pThis, pNode->node.id))
    24572457    {
    2458         CODECDBG_PRINT("PORT\n")
     2458        CODECDBG_PRINT("PORT\n");
    24592459    }
    24602460    else if (hdaCodecIsDacNode(pInfo->pThis, pNode->node.id))
    24612461    {
    2462         CODECDBG_PRINT("DAC\n")
     2462        CODECDBG_PRINT("DAC\n");
    24632463        CODECDBG_INDENT
    24642464            codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
    … …  
    24702470    else if (hdaCodecIsAdcVolNode(pInfo->pThis, pNode->node.id))
    24712471    {
    2472         CODECDBG_PRINT("ADC VOLUME\n")
     2472        CODECDBG_PRINT("ADC VOLUME\n");
    24732473        CODECDBG_INDENT
    24742474            codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
    … …  
    24792479    else if (hdaCodecIsAdcNode(pInfo->pThis, pNode->node.id))
    24802480    {
    2481         CODECDBG_PRINT("ADC\n")
     2481        CODECDBG_PRINT("ADC\n");
    24822482        CODECDBG_INDENT
    24832483            codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
    … …  
    24892489    else if (hdaCodecIsAdcMuxNode(pInfo->pThis, pNode->node.id))
    24902490    {
    2491         CODECDBG_PRINT("ADC MUX\n")
     2491        CODECDBG_PRINT("ADC MUX\n");
    24922492        CODECDBG_INDENT
    24932493            codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
    … …  
    24982498    else if (hdaCodecIsPcbeepNode(pInfo->pThis, pNode->node.id))
    24992499    {
    2500         CODECDBG_PRINT("PC BEEP\n")
     2500        CODECDBG_PRINT("PC BEEP\n");
    25012501    }
    25022502    else if (hdaCodecIsSpdifOutNode(pInfo->pThis, pNode->node.id))
    25032503    {
    2504         CODECDBG_PRINT("SPDIF OUT\n")
     2504        CODECDBG_PRINT("SPDIF OUT\n");
    25052505    }
    25062506    else if (hdaCodecIsSpdifInNode(pInfo->pThis, pNode->node.id))
    25072507    {
    2508         CODECDBG_PRINT("SPDIF IN\n")
     2508        CODECDBG_PRINT("SPDIF IN\n");
    25092509    }
    25102510    else if (hdaCodecIsDigInPinNode(pInfo->pThis, pNode->node.id))
    25112511    {
    2512         CODECDBG_PRINT("DIGITAL IN PIN\n")
     2512        CODECDBG_PRINT("DIGITAL IN PIN\n");
    25132513    }
    25142514    else if (hdaCodecIsDigOutPinNode(pInfo->pThis, pNode->node.id))
    25152515    {
    2516         CODECDBG_PRINT("DIGITAL OUT PIN\n")
     2516        CODECDBG_PRINT("DIGITAL OUT PIN\n");
    25172517    }
    25182518    else if (hdaCodecIsCdNode(pInfo->pThis, pNode->node.id))
    25192519    {
    2520         CODECDBG_PRINT("CD\n")
     2520        CODECDBG_PRINT("CD\n");
    25212521    }
    25222522    else if (hdaCodecIsVolKnobNode(pInfo->pThis, pNode->node.id))
    25232523    {
    2524         CODECDBG_PRINT("VOLUME KNOB\n")
     2524        CODECDBG_PRINT("VOLUME KNOB\n");
    25252525    }
    25262526    else if (hdaCodecIsReservedNode(pInfo->pThis, pNode->node.id))
    25272527    {
    2528         CODECDBG_PRINT("RESERVED\n")
     2528        CODECDBG_PRINT("RESERVED\n");
    25292529    }
    25302530    else
    … …  
    26872687            return rc;
    26882688        AssertLogRelMsgReturn(idOld == pThis->paNodes[idxNode].SavedState.Core.id,
    2689                               ("loaded %#x, expected \n", pThis->paNodes[idxNode].SavedState.Core.id, idOld),
     2689                              ("loaded %#x, expected %#x\n", pThis->paNodes[idxNode].SavedState.Core.id, idOld),
    26902690                              VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
    26912691    }

  • trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp

    r56648 r56992  
    245245        if (hFile == -1)
    246246        {
    247             LogRel(("OSS: Failed to open %s: %s\n", pszDev, strerror(errno)));
     247            LogRel(("OSS: Failed to open %s: %s(%d)\n", pszDev, strerror(errno), errno));
    248248            rc = RTErrConvertFromErrno(errno);
    249249            break;
    … …  
    253253        if (ioctl(hFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
    254254        {
    255             LogRel(("OSS: Failed to set audio format to %ld\n",
    256                     iFormat, strerror(errno)));
     255            LogRel(("OSS: Failed to set audio format to %ld errno=%s(%d)\n", iFormat, strerror(errno), errno));
    257256            rc = RTErrConvertFromErrno(errno);
    258257            break;
    … …  
    262261        if (ioctl(hFile, SNDCTL_DSP_CHANNELS, &cChannels))
    263262        {
    264             LogRel(("OSS: Failed to set number of audio channels (%d): %s\n",
    265                      pReq->cChannels, strerror(errno)));
     263            LogRel(("OSS: Failed to set number of audio channels (%d): %s(%d)\n", pReq->cChannels, strerror(errno), errno));
    266264            rc = RTErrConvertFromErrno(errno);
    267265            break;
    … …  
    271269        if (ioctl(hFile, SNDCTL_DSP_SPEED, &freq))
    272270        {
    273             LogRel(("OSS: Failed to set audio frequency (%dHZ): %s\n",
    274                     pReq->uFreq, strerror(errno)));
     271            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s(%d)\n", pReq->uFreq, strerror(errno), errno));
    275272            rc = RTErrConvertFromErrno(errno);
    276273            break;
    … …  
    281278        if (ioctl(hFile, SNDCTL_DSP_NONBLOCK))
    282279        {
    283             LogRel(("OSS: Failed to set non-blocking mode: %s\n",
    284                     strerror(errno)));
     280            LogRel(("OSS: Failed to set non-blocking mode: %s(%d)\n", strerror(errno), errno));
    285281            rc = RTErrConvertFromErrno(errno);
    286282            break;
    … …  
    290286        if (ioctl(hFile, SNDCTL_DSP_SETFRAGMENT, &mmmmssss))
    291287        {
    292             LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s\n",
    293                     pReq->cFragments, pReq->cbFragmentSize, strerror(errno)));
     288            LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s(%d)\n",
     289                    pReq->cFragments, pReq->cbFragmentSize, strerror(errno), errno));
    294290            rc = RTErrConvertFromErrno(errno);
    295291            break;
    … …  
    297293
    298294        audio_buf_info abinfo;
    299         if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE,
    300                   &abinfo))
    301         {
    302             LogRel(("OSS: Failed to retrieve buffer length: %s\n", strerror(errno)));
     295        if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &abinfo))
     296        {
     297            LogRel(("OSS: Failed to retrieve buffer length: %s(%d)\n", strerror(errno), errno));
    303298            rc = RTErrConvertFromErrno(errno);
    304299            break;
    305300        }
    306301
    307         rc = drvHostOSSAudioOSSToFmt(iFormat,
    308                                      &pObt->enmFormat, &pObt->enmENDIANNESS);
     302        rc = drvHostOSSAudioOSSToFmt(iFormat, &pObt->enmFormat, &pObt->enmENDIANNESS);
    309303        if (RT_SUCCESS(rc))
    310304        {

  • trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

    r56292 r56992  
    16161616
    16171617    Log(("Set region address: %02x:%02x.%d region %d address=%lld\n",
    1618          uBus, uDevFn>>3, uDevFn&7, addr));
     1618         uBus, uDevFn >> 3, uDevFn & 7, iRegion, addr));
    16191619
    16201620    if ( iRegion == PCI_ROM_SLOT )

  • trunk/src/VBox/Devices/EFI/DevEFI.cpp

    r56292 r56992  
    423423            if (RT_FAILURE(rc))
    424424                LogRel(("EFI/nvramLoad: Bad variable #%u: cbValue=%#x cchName=%#x (strlen=%#x) szName=%.*Rhxs\n",
    425                         pEfiVar->cbValue, pEfiVar->cchName, cchName, pEfiVar->cchName + 1, pEfiVar->szName));
     425                        iVar, pEfiVar->cbValue, pEfiVar->cchName, cchName, pEfiVar->cchName + 1, pEfiVar->szName));
    426426        }
    427427        if (RT_FAILURE(rc))
    … …  
    15141514            pThis->NVRAM.offOpBuffer = 0;
    15151515            pThis->NVRAM.enmOp = (EFIVAROP)u32;
    1516             Log2(("EFI_VARIABLE_OP: enmOp=%#x (%d)\n", u32));
     1516            Log2(("EFI_VARIABLE_OP: enmOp=%#x (%d)\n", u32, u32));
    15171517            break;
    15181518        }
    … …  
    16711671static DECLCALLBACK(void *) devEfiQueryInterface(PPDMIBASE pInterface, const char *pszIID)
    16721672{
    1673     LogFlowFunc(("ENTER: pIBase: %p, pszIID:%p\n", __FUNCTION__, pInterface, pszIID));
     1673    LogFlowFunc(("ENTER: pIBase=%p pszIID=%p\n", pInterface, pszIID));
    16741674    PDEVEFI  pThis = RT_FROM_MEMBER(pInterface, DEVEFI, Lun0.IBase);
    16751675

  • trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

    r56944 r56992  
    33383338        offSrc += src.offset;
    33393339        AssertMsgReturn(src.offset < pThis->vram_size,
    3340                         ("src.offset=%#x offSrc=%#x cbSrcPitch=%#x cHeight=%#x cbWidth=%#x cbTotal=%#x vram_size=%#x\n",
     3340                        ("src.offset=%#x offSrc=%#x cbSrcPitch=%#x cHeight=%#x cbWidth=%#x vram_size=%#x\n",
    33413341                         src.offset, offSrc, cbSrcPitch, cHeight, cbWidth, pThis->vram_size),
    33423342                        VERR_INVALID_PARAMETER);
    33433343        AssertMsgReturn(offSrc + cbSrcPitch * (cHeight - 1) + cbWidth <= pThis->vram_size,
    3344                         ("src.offset=%#x offSrc=%#x cbSrcPitch=%#x cHeight=%#x cbWidth=%#x cbTotal=%#x vram_size=%#x\n",
     3344                        ("src.offset=%#x offSrc=%#x cbSrcPitch=%#x cHeight=%#x cbWidth=%#x vram_size=%#x\n",
    33453345                         src.offset, offSrc, cbSrcPitch, cHeight, cbWidth, pThis->vram_size),
    33463346                        VERR_INVALID_PARAMETER);

  • trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

    r56969 r56992  
    528528    {
    529529        /* Turn off VBVA processing. */
    530         LogRel(("VBVA: Disabling\n", rc));
     530        LogRel(("VBVA: Disabling (%Rrc)\n", rc));
    531531        pVGAState->fGuestCaps = 0;
    532532        pVGAState->pDrv->pfnVBVAGuestCapabilityUpdate(pVGAState->pDrv, pVGAState->fGuestCaps);

  • trunk/src/VBox/Devices/Network/DrvIntNet.cpp

    r56292 r56992  
    783783                                    if (RT_FAILURE(rc))
    784784                                    {
    785                                         Log(("drvR3IntNetRecvRun: drvR3IntNetRecvWaitForSpace -> %Rrc; iSeg=%u cSegs=%u\n", iSeg, cSegs));
     785                                        Log(("drvR3IntNetRecvRun: drvR3IntNetRecvWaitForSpace -> %Rrc; iSeg=%u cSegs=%u\n", rc, iSeg, cSegs));
    786786                                        break; /* we drop the rest. */
    787787                                    }

  • trunk/src/VBox/Devices/Network/slirp/debug.h

    r56292 r56992  
    4141
    4242#ifdef LOG_ENABLED
    43 # define TCP_STATE_SWITCH_TO(tp, new_tcp_state)                                                                     \
    44 do {                                                                                                                \
    45     Log2(("%R[tcpcb793] switch to %R[tcpstate] -> %R[tcpstate]\n", (tp), (tp), (tp->t_state) ,(new_tcp_state)));    \
    46     if ((tp)->t_socket)                                                                                            \
    47         Log2(("%R[tcpcb793] %R[natsock]\n", (tp), (tp)->t_socket));                                                \
    48     (tp)->t_state = (new_tcp_state);                                                                                \
    49 } while(0)
     43# define TCP_STATE_SWITCH_TO(tp, new_tcp_state) \
     44  do { \
     45      Log2(("%R[tcpcb793] switch to %R[tcpstate] -> %R[tcpstate]\n", (tp), (tp->t_state) ,(new_tcp_state))); \
     46      if ((tp)->t_socket) \
     47          Log2(("%R[tcpcb793] %R[natsock]\n", (tp), (tp)->t_socket)); \
     48      (tp)->t_state = (new_tcp_state); \
     49  } while (0)
    5050#else
    5151# define TCP_STATE_SWITCH_TO(tp, new_tcp_state) (tp)->t_state = (new_tcp_state)
    … …  
    5757 */
    5858#ifdef DEBUG_vvl
    59 # define TCP_ACCEPTABLE_STATE1(tp, tcp_state1) Assert(((tp)->t_state == (tcp_state)))
    60 # define TCP_ACCEPTABLE_STATE2(tp, tcp_state1, tcp_state2)                          \
    61 do {                                                                                \
    62     Assert((   ((tp)->t_state == (tcp_state1))                                      \
    63             || ((tp)->t_state == (tcp_state2))));                                   \
    64 } while(0)
     59# define TCP_ACCEPTABLE_STATE1(tp, tcp_state1) Assert((tp)->t_state == (tcp_state))
     60# define TCP_ACCEPTABLE_STATE2(tp, tcp_state1, tcp_state2) \
     61    Assert(   (tp)->t_state == (tcp_state1)  \
     62           || (tp)->t_state == (tcp_state2) ); \
    6563#else
    6664# define TCP_ACCEPTABLE_STATE1(tp, tcp_state1) do { } while(0)

  • trunk/src/VBox/Devices/Network/slirp/slirp.c

    r56292 r56992  
    17831783void slirp_set_somaxconn(PNATState pData, int iSoMaxConn)
    17841784{
    1785     LogFlowFunc(("iSoMaxConn:d\n", iSoMaxConn));
     1785    LogFlowFunc(("iSoMaxConn:%d\n", iSoMaxConn));
    17861786    /* Conditions */
    17871787    if (iSoMaxConn > SOMAXCONN)

  • trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

    r56292 r56992  
    563563                else
    564564                {
    565                     RTPrintf("tstIntNet-1: Bad GSO frame: %Rhxs\n", sizeof(*pGso), pGso);
     565                    RTPrintf("tstIntNet-1: Bad GSO frame: %.*Rhxs\n", sizeof(*pGso), pGso);
    566566                    STAM_REL_COUNTER_INC(&pBuf->cStatBadFrames);
    567567                    g_cErrors++;

  • trunk/src/VBox/Devices/PC/DevPcArch.cpp

    r56292 r56992  
    8585            /* Reset. */
    8686            case 0xf1:
    87                 Log2(("PCARCH: FPU Reset cb=%d u32=%#x\n", Port, cb, u32));
     87                Log2(("PCARCH: FPU Reset cb=%d u32=%#x\n", cb, u32));
    8888                /** @todo figure out what the difference between FPU ports 0xf0 and 0xf1 are... */
    8989                /* pDevIns->pHlp->pfnPICSetIrq(pDevIns, 13, 0); */

  • trunk/src/VBox/Devices/Serial/DrvRawFile.cpp

    r56292 r56992  
    185185    if (RT_FAILURE(rc))
    186186    {
    187         LogRel(("RawFile%d: CreateFile failed rc=%Rrc\n", pDrvIns->iInstance));
     187        LogRel(("RawFile%d: CreateFile failed rc=%Rrc\n", pDrvIns->iInstance, rc));
    188188        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("RawFile#%d failed to create the raw output file %s"), pDrvIns->iInstance, pThis->pszLocation);
    189189    }

  • trunk/src/VBox/Devices/Storage/DevATA.cpp

    r56715 r56992  
    50855085                }
    50865086                else
    5087                     Log2(("%s: DUMMY/Overflow!\n", __FUNCTION__));
     5087                    Log2(("ataIOPortReadStr1Data: DUMMY/Overflow!\n"));
    50885088            }
    50895089            else
    … …  
    50925092                 * Dummy read (shouldn't happen) return 0xff like the non-string handler.
    50935093                 */
    5094                 Log2(("%s: DUMMY data (%#x bytes)\n", __FUNCTION__, *pcTransfers * cb));
     5094                Log2(("ataIOPortReadStr1Data: DUMMY data (%#x bytes)\n", *pcTransfers * cb));
    50955095                memset(pbDst, 0xff, *pcTransfers * cb);
    50965096                *pcTransfers = 0;
    … …  
    51055105    else
    51065106    {
    5107         Log2(("%s: 1 byte read (%#x transfers)\n", *pcTransfers));
     5107        Log2(("ataIOPortReadStr1Data: 1 byte read (%#x transfers)\n", *pcTransfers));
    51085108        AssertFailed();
    51095109        rc = VINF_SUCCESS;
    … …  
    51725172                }
    51735173                else
    5174                     Log2(("%s: DUMMY/Overflow!\n", __FUNCTION__));
     5174                    Log2(("ataIOPortWriteStr1Data: DUMMY/Overflow!\n"));
    51755175            }
    51765176            else
    51775177            {
    5178                 Log2(("%s: DUMMY data (%#x bytes)\n", __FUNCTION__, *pcTransfers * cb));
     5178                Log2(("ataIOPortWriteStr1Data: DUMMY data (%#x bytes)\n", *pcTransfers * cb));
    51795179                *pcTransfers = 0;
    51805180            }
    … …  
    51885188    else
    51895189    {
    5190         Log2(("%s: 1 byte write (%#x transfers)\n", *pcTransfers));
     5190        Log2(("ataIOPortWriteStr1Data: 1 byte write (%#x transfers)\n", *pcTransfers));
    51915191        AssertFailed();
    51925192        rc = VINF_SUCCESS;

  • trunk/src/VBox/Devices/Storage/DevFdc.cpp

    r56292 r56992  
    27932793    rc = fdConfig (drv, pDevIns, false /*fInit*/);
    27942794    AssertMsg (rc != VERR_PDM_NO_ATTACHED_DRIVER,
    2795                ("Configuration error: failed to configure drive %d, rc=%Rrc\n", rc));
     2795               ("Configuration error: failed to configure drive %d, rc=%Rrc\n", iLUN, rc));
    27962796    if (RT_SUCCESS(rc)) {
    27972797        fd_revalidate (drv);
    … …  
    29982998            && rc != VERR_PDM_NO_ATTACHED_DRIVER)
    29992999        {
    3000             AssertMsgFailed(("Configuration error: failed to configure drive %d, rc=%Rrc\n", rc));
     3000            AssertMsgFailed(("Configuration error: failed to configure drive %d, rc=%Rrc\n", i, rc));
    30013001            return rc;
    30023002        }

  • trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

    r56426 r56992  
    498498    if (pThis->enmState != LSILOGICSTATE_FAULT)
    499499    {
    500         Log(("%s: Setting I/O controller into FAULT state: uIOCFaultCode=%u\n", __FUNCTION__, uIOCFaultCode));
     500        LogFunc(("Setting I/O controller into FAULT state: uIOCFaultCode=%u\n", uIOCFaultCode));
    501501        pThis->enmState        = LSILOGICSTATE_FAULT;
    502502        pThis->u16IOCFaultCode = uIOCFaultCode;
    503503    }
    504504    else
    505         Log(("%s: We are already in FAULT state\n"));
     505        LogFunc(("We are already in FAULT state\n"));
    506506}
    507507

  • trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

    r56439 r56992  
    10161016
    10171017    rc = VSCSIDeviceCreate(&pThis->hVScsiDevice, drvscsiVScsiReqCompleted, pThis);
    1018     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI device rc=%Rrc\n"), rc);
     1018    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI device rc=%Rrc\n", rc), rc);
    10191019    rc = VSCSILunCreate(&pThis->hVScsiLun, enmLunType, &pThis->VScsiIoCallbacks,
    10201020                        pThis);
    1021     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI LUN rc=%Rrc\n"), rc);
     1021    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI LUN rc=%Rrc\n", rc), rc);
    10221022    rc = VSCSIDeviceLunAttach(pThis->hVScsiDevice, pThis->hVScsiLun, 0);
    10231023    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to attached the LUN to the SCSI device\n"), rc);
    … …  
    10571057        /* Create request queue. */
    10581058        rc = RTReqQueueCreate(&pThis->hQueueRequests);
    1059         AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n"), rc);
     1059        AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n", rc), rc);
    10601060        /* Create I/O thread. */
    10611061        rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pAsyncIOThread, pThis, drvscsiAsyncIOLoop,
    10621062                                   drvscsiAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
    1063         AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n"), rc);
     1063        AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n", rc), rc);
    10641064
    10651065        LogRel(("SCSI#%d: using normal I/O\n", pDrvIns->iInstance));
    … …  
    10711071        || (   pThis->pDrvBlockAsync
    10721072            && pThis->pDrvBlockAsync->pfnStartDiscard))
    1073         LogRel(("SCSI#%d: Enabled UNMAP support\n"));
     1073        LogRel(("SCSI#%d: Enabled UNMAP support\n", pDrvIns->iInstance));
    10741074
    10751075    return VINF_SUCCESS;

  • trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp

    r56292 r56992  
    368368
    369369    rc = RTReqQueueCall(pThis->hQueueRequests, &pReq, 10000 /* 10 sec. */, (PFNRT)drvscsihostAsyncIOLoopWakeupFunc, 0);
    370     AssertMsgRC(rc, ("Inserting request into queue failed rc=%Rrc\n"));
     370    AssertMsgRC(rc, ("Inserting request into queue failed rc=%Rrc\n", rc));
    371371
    372372    return rc;
    … …  
    472472    /* Create request queue. */
    473473    int rc = RTReqQueueCreate(&pThis->hQueueRequests);
    474     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n"), rc);
     474    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n", rc), rc);
    475475
    476476    /* Open the device. */
    … …  
    488488    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pAsyncIOThread, pThis, drvscsihostAsyncIOLoop,
    489489                               drvscsihostAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
    490     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n"), rc);
     490    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n", rc), rc);
    491491
    492492    return VINF_SUCCESS;

  • trunk/src/VBox/Devices/Storage/UsbMsd.cpp

    r56439 r56992  
    18901890         */
    18911891        case USBMSDREQSTATE_READY:
    1892             Log(("usbMsdHandleBulkDevToHost: enmState=READ (cbData=%#x)\n", pReq->enmState, pUrb->cbData));
     1892            Log(("usbMsdHandleBulkDevToHost: enmState=READ(%d) (cbData=%#x)\n", pReq->enmState, pUrb->cbData));
    18931893            return usbMsdCompleteStall(pThis, NULL, pUrb, "Bad state D2H: READY");
    18941894

  • trunk/src/VBox/Devices/USB/DevOHCI.cpp

    r56454 r56992  
    24682468                &&  DoneInt < pThis->dqic)
    24692469                pThis->dqic = DoneInt;
    2470             Log(("%s: ohciRhXferCompleteGeneralURB: ED=%#010x TD=%#010x Age=%d cbTotal=%#x NewCbp=%#010RX32 dqic=%d\n",
     2470            Log(("%s: ohciRhXferCompleteGeneralURB: ED=%#010x TD=%#010x Age=%d enmStatus=%d cbTotal=%#x NewCbp=%#010RX32 dqic=%d\n",
    24712471                 pUrb->pszDesc, pUrb->Hci.EdAddr, TdAddr, cFmAge, pUrb->enmStatus, Buf.cbTotal, NewCbp, pThis->dqic));
    24722472        }
    … …  
    26402640    if (pUrb->enmStatus == VUSBSTATUS_STALL)
    26412641    {
    2642         Log2(("%s: ohciRhXferError: STALL, giving up.\n", pUrb->pszDesc, pUrb->enmStatus));
     2642        Log2(("%s: ohciRhXferError: STALL, giving up.\n", pUrb->pszDesc));
    26432643        return true;
    26442644    }
    … …  
    46694669static int HcLSThreshold_w(POHCI pThis, uint32_t iReg, uint32_t val)
    46704670{
    4671     Log2(("HcLSThreshold_w(%#010x) => LST=0x%03x(%d)\n", val, val & 0x0fff));
     4671    Log2(("HcLSThreshold_w(%#010x) => LST=0x%03x(%d)\n", val, val & 0x0fff, val & 0x0fff));
    46724672    AssertMsg(val == OHCI_LS_THRESH,
    46734673              ("HCD tried to write bad LS threshold: 0x%x (see function header)\n", val));
    … …  
    50085008        {
    50095009            /* the guest is getting impatient. */
    5010             Log2(("HcRhPortStatus_w(): port %u: Impatient guest!\n"));
     5010            Log2(("HcRhPortStatus_w(): port %u: Impatient guest!\n", i));
    50115011            RTThreadYield();
    50125012        }

  • trunk/src/VBox/Devices/USB/VUSBDevice.cpp

    r56454 r56992  
    301301    if ((pSetup->bmRequestType & VUSB_RECIP_MASK) != VUSB_TO_DEVICE)
    302302    {
    303         Log(("vusb: error: %s: SET_CONFIGURATION - invalid request (dir) !!!\n", pDev->pUsbIns->pszName, iCfg));
     303        Log(("vusb: error: %s: SET_CONFIGURATION - invalid request (dir) !!!\n", pDev->pUsbIns->pszName));
    304304        return false;
    305305    }

  • trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

    r56292 r56992  
    972972        AssertMsg(pReq->header.size == 0x10028 && pReq->header.version == 10000,  /* don't complain about legacy!!! */
    973973                  ("VMMDev mouse shape structure has invalid size %d (%#x) version=%d!\n",
    974                    pReq->header.size, pReq->header.size, pReq->header.size, pReq->header.version));
     974                   pReq->header.size, pReq->header.size, pReq->header.version));
    975975        return VERR_INVALID_PARAMETER;
    976976    }
注意: 瀏覽 TracChangeset 來幫助您使用更動檢視器

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