Changeset 56992 in vbox for trunk/src/VBox

Timestamp:

Jul 18, 2015 11:01:44 PM (9 years ago)

Author:

vboxsync

Message:

Devices: Log & Assertion formatting fixes.

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchHdaCodec.cpp (modified) (8 diffs)
• Audio/DrvHostOSSAudio.cpp (modified) (7 diffs)
• Bus/DevPciIch9.cpp (modified) (1 diff)
• EFI/DevEFI.cpp (modified) (3 diffs)
• Graphics/DevVGA-SVGA.cpp (modified) (1 diff)
• Graphics/DevVGA_VBVA.cpp (modified) (1 diff)
• Network/DrvIntNet.cpp (modified) (1 diff)
• Network/slirp/debug.h (modified) (2 diffs)
• Network/slirp/slirp.c (modified) (1 diff)
• Network/testcase/tstIntNet-1.cpp (modified) (1 diff)
• PC/DevPcArch.cpp (modified) (1 diff)
• Serial/DrvRawFile.cpp (modified) (1 diff)
• Storage/DevATA.cpp (modified) (5 diffs)
• Storage/DevFdc.cpp (modified) (2 diffs)
• Storage/DevLsiLogicSCSI.cpp (modified) (1 diff)
• Storage/DrvSCSI.cpp (modified) (3 diffs)
• Storage/DrvSCSIHost.cpp (modified) (3 diffs)
• Storage/UsbMsd.cpp (modified) (1 diff)
• USB/DevOHCI.cpp (modified) (4 diffs)
• USB/VUSBDevice.cpp (modified) (1 diff)
• VMMDev/VMMDev.cpp (modified) (1 diff)

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

@@ -2355 +2355 @@
 #define CODECDBG_UNINDENT if (pInfo->uLevel) pInfo->uLevel--;
 
-#define CODECDBG_PRINT(x, ...)  pInfo->pHlp->pfnPrintf(pInfo->pHlp, x);
-#define CODECDBG_PRINTI(x, ...) codecDbgPrintf(pInfo, x);
+#define CODECDBG_PRINT(...)  pInfo->pHlp->pfnPrintf(pInfo->pHlp, __VA_ARGS__)
+#define CODECDBG_PRINTI(...) codecDbgPrintf(pInfo, __VA_ARGS__)
 
 static void codecDbgPrintfIndentV(PCODECDBGINFO pInfo, uint16_t uIndent, const char *pszFormat, va_list va)
@@ -2444 +2444 @@
     if (pNode->node.id == STAC9220_NID_ROOT)
     {
-        CODECDBG_PRINT("ROOT\n")
+        CODECDBG_PRINT("ROOT\n");
     }
     else if (pNode->node.id == STAC9220_NID_AFG)
     {
-        CODECDBG_PRINT("AFG\n")
+        CODECDBG_PRINT("AFG\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2456 +2456 @@
     else if (hdaCodecIsPortNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("PORT\n")
+        CODECDBG_PRINT("PORT\n");
     }
     else if (hdaCodecIsDacNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("DAC\n")
+        CODECDBG_PRINT("DAC\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2470 +2470 @@
     else if (hdaCodecIsAdcVolNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("ADC VOLUME\n")
+        CODECDBG_PRINT("ADC VOLUME\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2479 +2479 @@
     else if (hdaCodecIsAdcNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("ADC\n")
+        CODECDBG_PRINT("ADC\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2489 +2489 @@
     else if (hdaCodecIsAdcMuxNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("ADC MUX\n")
+        CODECDBG_PRINT("ADC MUX\n");
         CODECDBG_INDENT
             codecDbgPrintNodeRegF00(pInfo, pNode->node.au32F00_param);
@@ -2498 +2498 @@
     else if (hdaCodecIsPcbeepNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("PC BEEP\n")
+        CODECDBG_PRINT("PC BEEP\n");
     }
     else if (hdaCodecIsSpdifOutNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("SPDIF OUT\n")
+        CODECDBG_PRINT("SPDIF OUT\n");
     }
     else if (hdaCodecIsSpdifInNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("SPDIF IN\n")
+        CODECDBG_PRINT("SPDIF IN\n");
     }
     else if (hdaCodecIsDigInPinNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("DIGITAL IN PIN\n")
+        CODECDBG_PRINT("DIGITAL IN PIN\n");
     }
     else if (hdaCodecIsDigOutPinNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("DIGITAL OUT PIN\n")
+        CODECDBG_PRINT("DIGITAL OUT PIN\n");
     }
     else if (hdaCodecIsCdNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("CD\n")
+        CODECDBG_PRINT("CD\n");
     }
     else if (hdaCodecIsVolKnobNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("VOLUME KNOB\n")
+        CODECDBG_PRINT("VOLUME KNOB\n");
     }
     else if (hdaCodecIsReservedNode(pInfo->pThis, pNode->node.id))
     {
-        CODECDBG_PRINT("RESERVED\n")
+        CODECDBG_PRINT("RESERVED\n");
     }
     else
@@ -2687 +2687 @@
             return rc;
         AssertLogRelMsgReturn(idOld == pThis->paNodes[idxNode].SavedState.Core.id,
-                              ("loaded %#x, expected \n", pThis->paNodes[idxNode].SavedState.Core.id, idOld),
+                              ("loaded %#x, expected %#x\n", pThis->paNodes[idxNode].SavedState.Core.id, idOld),
                               VERR_SSM_DATA_UNIT_FORMAT_CHANGED);
     }

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

@@ -245 +245 @@
         if (hFile == -1)
         {
-            LogRel(("OSS: Failed to open %s: %s\n", pszDev, strerror(errno)));
+            LogRel(("OSS: Failed to open %s: %s(%d)\n", pszDev, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -253 +253 @@
         if (ioctl(hFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
         {
-            LogRel(("OSS: Failed to set audio format to %ld\n",
-                    iFormat, strerror(errno)));
+            LogRel(("OSS: Failed to set audio format to %ld errno=%s(%d)\n", iFormat, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -262 +261 @@
         if (ioctl(hFile, SNDCTL_DSP_CHANNELS, &cChannels))
         {
-            LogRel(("OSS: Failed to set number of audio channels (%d): %s\n",
-                     pReq->cChannels, strerror(errno)));
+            LogRel(("OSS: Failed to set number of audio channels (%d): %s(%d)\n", pReq->cChannels, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -271 +269 @@
         if (ioctl(hFile, SNDCTL_DSP_SPEED, &freq))
         {
-            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s\n",
-                    pReq->uFreq, strerror(errno)));
+            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s(%d)\n", pReq->uFreq, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -281 +278 @@
         if (ioctl(hFile, SNDCTL_DSP_NONBLOCK))
         {
-            LogRel(("OSS: Failed to set non-blocking mode: %s\n",
-                    strerror(errno)));
+            LogRel(("OSS: Failed to set non-blocking mode: %s(%d)\n", strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -290 +286 @@
         if (ioctl(hFile, SNDCTL_DSP_SETFRAGMENT, &mmmmssss))
         {
-            LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s\n",
-                    pReq->cFragments, pReq->cbFragmentSize, strerror(errno)));
+            LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s(%d)\n",
+                    pReq->cFragments, pReq->cbFragmentSize, strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -297 +293 @@
 
         audio_buf_info abinfo;
-        if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE,
-                  &abinfo))
-        {
-            LogRel(("OSS: Failed to retrieve buffer length: %s\n", strerror(errno)));
+        if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &abinfo))
+        {
+            LogRel(("OSS: Failed to retrieve buffer length: %s(%d)\n", strerror(errno), errno));
             rc = RTErrConvertFromErrno(errno);
             break;
         }
 
-        rc = drvHostOSSAudioOSSToFmt(iFormat,
-                                     &pObt->enmFormat, &pObt->enmENDIANNESS);
+        rc = drvHostOSSAudioOSSToFmt(iFormat, &pObt->enmFormat, &pObt->enmENDIANNESS);
         if (RT_SUCCESS(rc))
         {

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

@@ -1616 +1616 @@
 
     Log(("Set region address: %02x:%02x.%d region %d address=%lld\n",
-         uBus, uDevFn>>3, uDevFn&7, addr));
+         uBus, uDevFn >> 3, uDevFn & 7, iRegion, addr));
 
     if ( iRegion == PCI_ROM_SLOT )

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

@@ -423 +423 @@
             if (RT_FAILURE(rc))
                 LogRel(("EFI/nvramLoad: Bad variable #%u: cbValue=%#x cchName=%#x (strlen=%#x) szName=%.*Rhxs\n",
-                        pEfiVar->cbValue, pEfiVar->cchName, cchName, pEfiVar->cchName + 1, pEfiVar->szName));
+                        iVar, pEfiVar->cbValue, pEfiVar->cchName, cchName, pEfiVar->cchName + 1, pEfiVar->szName));
         }
         if (RT_FAILURE(rc))
@@ -1514 +1514 @@
             pThis->NVRAM.offOpBuffer = 0;
             pThis->NVRAM.enmOp = (EFIVAROP)u32;
-            Log2(("EFI_VARIABLE_OP: enmOp=%#x (%d)\n", u32));
+            Log2(("EFI_VARIABLE_OP: enmOp=%#x (%d)\n", u32, u32));
             break;
         }
@@ -1671 +1671 @@
 static DECLCALLBACK(void *) devEfiQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
-    LogFlowFunc(("ENTER: pIBase: %p, pszIID:%p\n", __FUNCTION__, pInterface, pszIID));
+    LogFlowFunc(("ENTER: pIBase=%p pszIID=%p\n", pInterface, pszIID));
     PDEVEFI  pThis = RT_FROM_MEMBER(pInterface, DEVEFI, Lun0.IBase);
 

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

@@ -3338 +3338 @@
         offSrc += src.offset;
         AssertMsgReturn(src.offset < pThis->vram_size,
-                        ("src.offset=%#x offSrc=%#x cbSrcPitch=%#x cHeight=%#x cbWidth=%#x cbTotal=%#x vram_size=%#x\n",
+                        ("src.offset=%#x offSrc=%#x cbSrcPitch=%#x cHeight=%#x cbWidth=%#x vram_size=%#x\n",
                          src.offset, offSrc, cbSrcPitch, cHeight, cbWidth, pThis->vram_size),
                         VERR_INVALID_PARAMETER);
         AssertMsgReturn(offSrc + cbSrcPitch * (cHeight - 1) + cbWidth <= pThis->vram_size,
-                        ("src.offset=%#x offSrc=%#x cbSrcPitch=%#x cHeight=%#x cbWidth=%#x cbTotal=%#x vram_size=%#x\n",
+                        ("src.offset=%#x offSrc=%#x cbSrcPitch=%#x cHeight=%#x cbWidth=%#x vram_size=%#x\n",
                          src.offset, offSrc, cbSrcPitch, cHeight, cbWidth, pThis->vram_size),
                         VERR_INVALID_PARAMETER);

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

@@ -528 +528 @@
     {
         /* Turn off VBVA processing. */
-        LogRel(("VBVA: Disabling\n", rc));
+        LogRel(("VBVA: Disabling (%Rrc)\n", rc));
         pVGAState->fGuestCaps = 0;
         pVGAState->pDrv->pfnVBVAGuestCapabilityUpdate(pVGAState->pDrv, pVGAState->fGuestCaps);

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

@@ -783 +783 @@
                                     if (RT_FAILURE(rc))
                                     {
-                                        Log(("drvR3IntNetRecvRun: drvR3IntNetRecvWaitForSpace -> %Rrc; iSeg=%u cSegs=%u\n", iSeg, cSegs));
+                                        Log(("drvR3IntNetRecvRun: drvR3IntNetRecvWaitForSpace -> %Rrc; iSeg=%u cSegs=%u\n", rc, iSeg, cSegs));
                                         break; /* we drop the rest. */
                                     }

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

@@ -41 +41 @@
 
 #ifdef LOG_ENABLED
-# define TCP_STATE_SWITCH_TO(tp, new_tcp_state)                                                                     \
-do {                                                                                                                \
-    Log2(("%R[tcpcb793] switch to %R[tcpstate] -> %R[tcpstate]\n", (tp), (tp), (tp->t_state) ,(new_tcp_state)));    \
-    if ((tp)->t_socket)                                                                                             \
-        Log2(("%R[tcpcb793] %R[natsock]\n", (tp), (tp)->t_socket));                                                 \
-    (tp)->t_state = (new_tcp_state);                                                                                \
-} while(0)
+# define TCP_STATE_SWITCH_TO(tp, new_tcp_state) \
+  do { \
+      Log2(("%R[tcpcb793] switch to %R[tcpstate] -> %R[tcpstate]\n", (tp), (tp->t_state) ,(new_tcp_state))); \
+      if ((tp)->t_socket) \
+          Log2(("%R[tcpcb793] %R[natsock]\n", (tp), (tp)->t_socket)); \
+      (tp)->t_state = (new_tcp_state); \
+  } while (0)
 #else
 # define TCP_STATE_SWITCH_TO(tp, new_tcp_state) (tp)->t_state = (new_tcp_state)
@@ -57 +57 @@
  */
 #ifdef DEBUG_vvl
-# define TCP_ACCEPTABLE_STATE1(tp, tcp_state1) Assert(((tp)->t_state == (tcp_state)))
-# define TCP_ACCEPTABLE_STATE2(tp, tcp_state1, tcp_state2)                          \
-do {                                                                                \
-    Assert((   ((tp)->t_state == (tcp_state1))                                      \
-            || ((tp)->t_state == (tcp_state2))));                                   \
-} while(0)
+# define TCP_ACCEPTABLE_STATE1(tp, tcp_state1) Assert((tp)->t_state == (tcp_state))
+# define TCP_ACCEPTABLE_STATE2(tp, tcp_state1, tcp_state2) \
+    Assert(   (tp)->t_state == (tcp_state1)  \
+           || (tp)->t_state == (tcp_state2) ); \
 #else
 # define TCP_ACCEPTABLE_STATE1(tp, tcp_state1) do { } while(0)

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

@@ -1783 +1783 @@
 void slirp_set_somaxconn(PNATState pData, int iSoMaxConn)
 {
-    LogFlowFunc(("iSoMaxConn:d\n", iSoMaxConn));
+    LogFlowFunc(("iSoMaxConn:%d\n", iSoMaxConn));
     /* Conditions */
     if (iSoMaxConn > SOMAXCONN)

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

@@ -563 +563 @@
                 else
                 {
-                    RTPrintf("tstIntNet-1: Bad GSO frame: %Rhxs\n", sizeof(*pGso), pGso);
+                    RTPrintf("tstIntNet-1: Bad GSO frame: %.*Rhxs\n", sizeof(*pGso), pGso);
                     STAM_REL_COUNTER_INC(&pBuf->cStatBadFrames);
                     g_cErrors++;

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

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

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

@@ -185 +185 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("RawFile%d: CreateFile failed rc=%Rrc\n", pDrvIns->iInstance));
+        LogRel(("RawFile%d: CreateFile failed rc=%Rrc\n", pDrvIns->iInstance, rc));
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("RawFile#%d failed to create the raw output file %s"), pDrvIns->iInstance, pThis->pszLocation);
     }

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

@@ -5085 +5085 @@
                 }
                 else
-                    Log2(("%s: DUMMY/Overflow!\n", __FUNCTION__));
+                    Log2(("ataIOPortReadStr1Data: DUMMY/Overflow!\n"));
             }
             else
@@ -5092 +5092 @@
                  * Dummy read (shouldn't happen) return 0xff like the non-string handler.
                  */
-                Log2(("%s: DUMMY data (%#x bytes)\n", __FUNCTION__, *pcTransfers * cb));
+                Log2(("ataIOPortReadStr1Data: DUMMY data (%#x bytes)\n", *pcTransfers * cb));
                 memset(pbDst, 0xff, *pcTransfers * cb);
                 *pcTransfers = 0;
@@ -5105 +5105 @@
     else
     {
-        Log2(("%s: 1 byte read (%#x transfers)\n", *pcTransfers));
+        Log2(("ataIOPortReadStr1Data: 1 byte read (%#x transfers)\n", *pcTransfers));
         AssertFailed();
         rc = VINF_SUCCESS;
@@ -5172 +5172 @@
                 }
                 else
-                    Log2(("%s: DUMMY/Overflow!\n", __FUNCTION__));
+                    Log2(("ataIOPortWriteStr1Data: DUMMY/Overflow!\n"));
             }
             else
             {
-                Log2(("%s: DUMMY data (%#x bytes)\n", __FUNCTION__, *pcTransfers * cb));
+                Log2(("ataIOPortWriteStr1Data: DUMMY data (%#x bytes)\n", *pcTransfers * cb));
                 *pcTransfers = 0;
             }
@@ -5188 +5188 @@
     else
     {
-        Log2(("%s: 1 byte write (%#x transfers)\n", *pcTransfers));
+        Log2(("ataIOPortWriteStr1Data: 1 byte write (%#x transfers)\n", *pcTransfers));
         AssertFailed();
         rc = VINF_SUCCESS;

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

@@ -2793 +2793 @@
     rc = fdConfig (drv, pDevIns, false /*fInit*/);
     AssertMsg (rc != VERR_PDM_NO_ATTACHED_DRIVER,
-               ("Configuration error: failed to configure drive %d, rc=%Rrc\n", rc));
+               ("Configuration error: failed to configure drive %d, rc=%Rrc\n", iLUN, rc));
     if (RT_SUCCESS(rc)) {
         fd_revalidate (drv);
@@ -2998 +2998 @@
             && rc != VERR_PDM_NO_ATTACHED_DRIVER)
         {
-            AssertMsgFailed(("Configuration error: failed to configure drive %d, rc=%Rrc\n", rc));
+            AssertMsgFailed(("Configuration error: failed to configure drive %d, rc=%Rrc\n", i, rc));
             return rc;
         }

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

@@ -498 +498 @@
     if (pThis->enmState != LSILOGICSTATE_FAULT)
     {
-        Log(("%s: Setting I/O controller into FAULT state: uIOCFaultCode=%u\n", __FUNCTION__, uIOCFaultCode));
+        LogFunc(("Setting I/O controller into FAULT state: uIOCFaultCode=%u\n", uIOCFaultCode));
         pThis->enmState        = LSILOGICSTATE_FAULT;
         pThis->u16IOCFaultCode = uIOCFaultCode;
     }
     else
-        Log(("%s: We are already in FAULT state\n"));
+        LogFunc(("We are already in FAULT state\n"));
 }
 

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

@@ -1016 +1016 @@
 
     rc = VSCSIDeviceCreate(&pThis->hVScsiDevice, drvscsiVScsiReqCompleted, pThis);
-    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI device rc=%Rrc\n"), rc);
+    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI device rc=%Rrc\n", rc), rc);
     rc = VSCSILunCreate(&pThis->hVScsiLun, enmLunType, &pThis->VScsiIoCallbacks,
                         pThis);
-    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI LUN rc=%Rrc\n"), rc);
+    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create VSCSI LUN rc=%Rrc\n", rc), rc);
     rc = VSCSIDeviceLunAttach(pThis->hVScsiDevice, pThis->hVScsiLun, 0);
     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to attached the LUN to the SCSI device\n"), rc);
@@ -1057 +1057 @@
         /* Create request queue. */
         rc = RTReqQueueCreate(&pThis->hQueueRequests);
-        AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n"), rc);
+        AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n", rc), rc);
         /* Create I/O thread. */
         rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pAsyncIOThread, pThis, drvscsiAsyncIOLoop,
                                    drvscsiAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
-        AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n"), rc);
+        AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n", rc), rc);
 
         LogRel(("SCSI#%d: using normal I/O\n", pDrvIns->iInstance));
@@ -1071 +1071 @@
         || (   pThis->pDrvBlockAsync
             && pThis->pDrvBlockAsync->pfnStartDiscard))
-        LogRel(("SCSI#%d: Enabled UNMAP support\n"));
+        LogRel(("SCSI#%d: Enabled UNMAP support\n", pDrvIns->iInstance));
 
     return VINF_SUCCESS;

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

@@ -368 +368 @@
 
     rc = RTReqQueueCall(pThis->hQueueRequests, &pReq, 10000 /* 10 sec. */, (PFNRT)drvscsihostAsyncIOLoopWakeupFunc, 0);
-    AssertMsgRC(rc, ("Inserting request into queue failed rc=%Rrc\n"));
+    AssertMsgRC(rc, ("Inserting request into queue failed rc=%Rrc\n", rc));
 
     return rc;
@@ -472 +472 @@
     /* Create request queue. */
     int rc = RTReqQueueCreate(&pThis->hQueueRequests);
-    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n"), rc);
+    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create request queue rc=%Rrc\n", rc), rc);
 
     /* Open the device. */
@@ -488 +488 @@
     rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pAsyncIOThread, pThis, drvscsihostAsyncIOLoop,
                                drvscsihostAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
-    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n"), rc);
+    AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n", rc), rc);
 
     return VINF_SUCCESS;

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

@@ -1890 +1890 @@
          */
         case USBMSDREQSTATE_READY:
-            Log(("usbMsdHandleBulkDevToHost: enmState=READ (cbData=%#x)\n", pReq->enmState, pUrb->cbData));
+            Log(("usbMsdHandleBulkDevToHost: enmState=READ(%d) (cbData=%#x)\n", pReq->enmState, pUrb->cbData));
             return usbMsdCompleteStall(pThis, NULL, pUrb, "Bad state D2H: READY");
 

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

@@ -2468 +2468 @@
                 &&  DoneInt < pThis->dqic)
                 pThis->dqic = DoneInt;
-            Log(("%s: ohciRhXferCompleteGeneralURB: ED=%#010x TD=%#010x Age=%d cbTotal=%#x NewCbp=%#010RX32 dqic=%d\n",
+            Log(("%s: ohciRhXferCompleteGeneralURB: ED=%#010x TD=%#010x Age=%d enmStatus=%d cbTotal=%#x NewCbp=%#010RX32 dqic=%d\n",
                  pUrb->pszDesc, pUrb->Hci.EdAddr, TdAddr, cFmAge, pUrb->enmStatus, Buf.cbTotal, NewCbp, pThis->dqic));
         }
@@ -2640 +2640 @@
     if (pUrb->enmStatus == VUSBSTATUS_STALL)
     {
-        Log2(("%s: ohciRhXferError: STALL, giving up.\n", pUrb->pszDesc, pUrb->enmStatus));
+        Log2(("%s: ohciRhXferError: STALL, giving up.\n", pUrb->pszDesc));
         return true;
     }
@@ -4669 +4669 @@
 static int HcLSThreshold_w(POHCI pThis, uint32_t iReg, uint32_t val)
 {
-    Log2(("HcLSThreshold_w(%#010x) => LST=0x%03x(%d)\n", val, val & 0x0fff));
+    Log2(("HcLSThreshold_w(%#010x) => LST=0x%03x(%d)\n", val, val & 0x0fff, val & 0x0fff));
     AssertMsg(val == OHCI_LS_THRESH,
               ("HCD tried to write bad LS threshold: 0x%x (see function header)\n", val));
@@ -5008 +5008 @@
         {
             /* the guest is getting impatient. */
-            Log2(("HcRhPortStatus_w(): port %u: Impatient guest!\n"));
+            Log2(("HcRhPortStatus_w(): port %u: Impatient guest!\n", i));
             RTThreadYield();
         }

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

@@ -301 +301 @@
     if ((pSetup->bmRequestType & VUSB_RECIP_MASK) != VUSB_TO_DEVICE)
     {
-        Log(("vusb: error: %s: SET_CONFIGURATION - invalid request (dir) !!!\n", pDev->pUsbIns->pszName, iCfg));
+        Log(("vusb: error: %s: SET_CONFIGURATION - invalid request (dir) !!!\n", pDev->pUsbIns->pszName));
         return false;
     }

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

@@ -972 +972 @@
         AssertMsg(pReq->header.size == 0x10028 && pReq->header.version == 10000,  /* don't complain about legacy!!! */
                   ("VMMDev mouse shape structure has invalid size %d (%#x) version=%d!\n",
-                   pReq->header.size, pReq->header.size, pReq->header.size, pReq->header.version));
+                   pReq->header.size, pReq->header.size, pReq->header.version));
         return VERR_INVALID_PARAMETER;
     }