Changeset 63016 in vbox
- Timestamp:
- Aug 4, 2016 10:47:52 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 109628
- Location:
- trunk/src/VBox/Devices
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DevIchHda.cpp
r62974 r63016 5190 5190 */ 5191 5191 static DECLCALLBACK(size_t) hdaDbgFmtBDLE(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput, 5192 const char *pszType, void const *pvValue, 5193 int cchWidth, int cchPrecision, unsigned fFlags, 5194 void *pvUser) 5195 { 5192 const char *pszType, void const *pvValue, 5193 int cchWidth, int cchPrecision, unsigned fFlags, 5194 void *pvUser) 5195 { 5196 RT_NOREF(pszType, cchWidth, cchPrecision, fFlags, pvUser); 5196 5197 PHDABDLE pBDLE = (PHDABDLE)pvValue; 5197 5198 return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, … … 5209 5210 void *pvUser) 5210 5211 { 5212 RT_NOREF(pszType, cchWidth, cchPrecision, fFlags, pvUser); 5211 5213 uint32_t uSDCTL = (uint32_t)(uintptr_t)pvValue; 5212 5214 return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, … … 5231 5233 void *pvUser) 5232 5234 { 5235 RT_NOREF(pszType, cchWidth, cchPrecision, fFlags, pvUser); 5233 5236 uint32_t uSDFIFOS = (uint32_t)(uintptr_t)pvValue; 5234 5237 return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "SDFIFOS(raw:%#x, sdfifos:%RU8 B)", uSDFIFOS, hdaSDFIFOSToBytes(uSDFIFOS)); … … 5243 5246 void *pvUser) 5244 5247 { 5248 RT_NOREF(pszType, cchWidth, cchPrecision, fFlags, pvUser); 5245 5249 uint32_t uSDFIFOW = (uint32_t)(uintptr_t)pvValue; 5246 5250 return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "SDFIFOW(raw: %#0x, sdfifow:%d B)", uSDFIFOW, hdaSDFIFOWToBytes(uSDFIFOW)); … … 5255 5259 void *pvUser) 5256 5260 { 5261 RT_NOREF(pszType, cchWidth, cchPrecision, fFlags, pvUser); 5257 5262 uint32_t uSdSts = (uint32_t)(uintptr_t)pvValue; 5258 5263 return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, … … 5265 5270 } 5266 5271 5267 static int hdaDbgLookupRegByName( PHDASTATE pThis,const char *pszArgs)5272 static int hdaDbgLookupRegByName(const char *pszArgs) 5268 5273 { 5269 5274 int iReg = 0; … … 5289 5294 { 5290 5295 PHDASTATE pThis = PDMINS_2_DATA(pDevIns, PHDASTATE); 5291 int iHdaRegisterIndex = hdaDbgLookupRegByName(p This, pszArgs);5296 int iHdaRegisterIndex = hdaDbgLookupRegByName(pszArgs); 5292 5297 if (iHdaRegisterIndex != -1) 5293 5298 hdaDbgPrintRegister(pThis, pHlp, iHdaRegisterIndex); … … 5330 5335 HDA_STREAM_REG(pThis, BDPU, iIdx)); 5331 5336 uint16_t u16LVI = HDA_STREAM_REG(pThis, LVI, iIdx); 5332 uint32_t u32CBL = HDA_STREAM_REG(pThis, CBL, iIdx);5337 /*uint32_t u32CBL = HDA_STREAM_REG(pThis, CBL, iIdx); - unused */ 5333 5338 5334 5339 if (!u64BaseDMA) … … 5372 5377 static int hdaDbgLookupStrmIdx(PHDASTATE pThis, const char *pszArgs) 5373 5378 { 5379 RT_NOREF(pThis, pszArgs); 5374 5380 /** @todo Add args parsing. */ 5375 5381 return -1; -
trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp
r62991 r63016 2937 2937 static DECLCALLBACK(void) codecDbgListNodes(PHDACODEC pThis, PCDBGFINFOHLP pHlp, const char *pszArgs) 2938 2938 { 2939 RT_NOREF(pszArgs); 2939 2940 pHlp->pfnPrintf(pHlp, "HDA LINK / INPUTS\n"); 2940 2941 … … 2960 2961 static DECLCALLBACK(void) codecDbgSelector(PHDACODEC pThis, PCDBGFINFOHLP pHlp, const char *pszArgs) 2961 2962 { 2962 2963 RT_NOREF(pThis, pHlp, pszArgs); 2963 2964 } 2964 2965 #endif -
trunk/src/VBox/Devices/EFI/DevEFI.cpp
r62965 r63016 1208 1208 1209 1209 #ifdef IN_RING3 1210 static void efiVBoxDbgScript( PDEVEFI pThis,const char *pszFormat, ...)1210 static void efiVBoxDbgScript(const char *pszFormat, ...) 1211 1211 { 1212 1212 # ifdef DEVEFI_WITH_VBOXDBG_SCRIPT … … 1222 1222 } 1223 1223 # else 1224 RT_NOREF(p This, pszFormat);1224 RT_NOREF(pszFormat); 1225 1225 # endif 1226 1226 } … … 1270 1270 pThis->ImageEvt.offName - 4, pThis->ImageEvt.szName, pThis->ImageEvt.uAddr0, pThis->ImageEvt.cb0)); 1271 1271 if (pThis->ImageEvt.offName > 4) 1272 efiVBoxDbgScript( pThis,"loadimage32 '%.*s.efi' %#llx\n",1272 efiVBoxDbgScript("loadimage32 '%.*s.efi' %#llx\n", 1273 1273 pThis->ImageEvt.offName - 4, pThis->ImageEvt.szName, pThis->ImageEvt.uAddr0); 1274 1274 break; … … 1277 1277 pThis->ImageEvt.offName - 4, pThis->ImageEvt.szName, pThis->ImageEvt.uAddr0, pThis->ImageEvt.cb0)); 1278 1278 if (pThis->ImageEvt.offName > 4) 1279 efiVBoxDbgScript( pThis,"loadimage64 '%.*s.efi' %#llx\n",1279 efiVBoxDbgScript("loadimage64 '%.*s.efi' %#llx\n", 1280 1280 pThis->ImageEvt.offName - 4, pThis->ImageEvt.szName, pThis->ImageEvt.uAddr0); 1281 1281 break; … … 1288 1288 pThis->ImageEvt.uAddr0, pThis->ImageEvt.cb0)); 1289 1289 if (pThis->ImageEvt.offName > 4) 1290 efiVBoxDbgScript( pThis,"unload '%.*s.efi'\n",1290 efiVBoxDbgScript("unload '%.*s.efi'\n", 1291 1291 pThis->ImageEvt.offName - 4 - pThis->ImageEvt.offNameLastComponent, 1292 1292 &pThis->ImageEvt.szName[pThis->ImageEvt.offNameLastComponent]); -
trunk/src/VBox/Devices/Network/lwip-new/vbox/include/lwip-log.h
r55980 r63016 23 23 * ends up as RT's level4. Non-default levels are currently not used 24 24 * much in lwip sources, so enable l4 to get the logs. 25 * 26 * Caveat: Slight snag. The LOG_GROUP_LWIP_XXXX are enum values and 27 * the lwIP XXXX_DEBUG macros are used in \#if XXXX_DEBUG 28 * tests around the place. This make MSC raise complaint 29 * C4668, that e.g. 'LOG_GROUP_LWIP_IP4' is not defined as a 30 * preprocessor macro and therefore placed with '0'. However, 31 * that works just fine because we or LWIP_DB_ON so the test 32 * is true despite the warning. Thus the pragma below 25 33 */ 34 # ifdef _MSC_VER 35 # pragma warning(disable:4668) 36 # endif 26 37 27 # define LWIP_DEBUGF_LOG_GROUP_SHIFT 828 # define LWIP_DEBUGF_LOG_GROUP(_g) \29 (((_g) << LWIP_DEBUGF_LOG_GROUP_SHIFT) | LWIP_DBG_ON)38 # define LWIP_DEBUGF_LOG_GROUP_SHIFT 8 39 # define LWIP_DEBUGF_LOG_GROUP(_g) \ 40 (((_g) << LWIP_DEBUGF_LOG_GROUP_SHIFT) | LWIP_DBG_ON) 30 41 31 # define API_LIB_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_API_LIB)32 # define API_MSG_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_API_MSG)33 # define ETHARP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_ETHARP)34 # define ICMP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_ICMP)35 # define IGMP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_IGMP)36 # define INET_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_INET)37 # define IP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_IP4)38 # define IP_REASS_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_IP4_REASS)39 # define IP6_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_IP6)40 # define MEM_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_MEM)41 # define MEMP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_MEMP)42 # define NETIF_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_NETIF)43 # define PBUF_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_PBUF)44 # define RAW_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_RAW)45 # define SOCKETS_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_SOCKETS)46 # define SYS_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_SYS)47 # define TCP_CWND_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_CWND)48 # define TCP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP)49 # define TCP_FR_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_FR)50 # define TCP_INPUT_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_INPUT)51 # define TCP_OUTPUT_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_OUTPUT)52 # define TCP_QLEN_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_QLEN)53 # define TCP_RST_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_RST)54 # define TCP_RTO_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_RTO)55 # define TCP_WND_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_WND)56 # define TCPIP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCPIP)57 # define TIMERS_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TIMERS)58 # define UDP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_UDP)42 # define API_LIB_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_API_LIB) 43 # define API_MSG_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_API_MSG) 44 # define ETHARP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_ETHARP) 45 # define ICMP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_ICMP) 46 # define IGMP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_IGMP) 47 # define INET_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_INET) 48 # define IP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_IP4) 49 # define IP_REASS_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_IP4_REASS) 50 # define IP6_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_IP6) 51 # define MEM_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_MEM) 52 # define MEMP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_MEMP) 53 # define NETIF_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_NETIF) 54 # define PBUF_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_PBUF) 55 # define RAW_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_RAW) 56 # define SOCKETS_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_SOCKETS) 57 # define SYS_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_SYS) 58 # define TCP_CWND_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_CWND) 59 # define TCP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP) 60 # define TCP_FR_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_FR) 61 # define TCP_INPUT_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_INPUT) 62 # define TCP_OUTPUT_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_OUTPUT) 63 # define TCP_QLEN_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_QLEN) 64 # define TCP_RST_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_RST) 65 # define TCP_RTO_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_RTO) 66 # define TCP_WND_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCP_WND) 67 # define TCPIP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TCPIP) 68 # define TIMERS_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_TIMERS) 69 # define UDP_DEBUG LWIP_DEBUGF_LOG_GROUP(LOG_GROUP_LWIP_UDP) 59 70 60 71 /* … … 63 74 * log groups defined for them currently. 64 75 */ 65 # undef AUTOIP_DEBUG66 # undef DHCP_DEBUG67 # undef DNS_DEBUG68 # undef PPP_DEBUG69 # undef SLIP_DEBUG70 # undef SNMP_MIB_DEBUG71 # undef SNMP_MSG_DEBUG76 # undef AUTOIP_DEBUG 77 # undef DHCP_DEBUG 78 # undef DNS_DEBUG 79 # undef PPP_DEBUG 80 # undef SLIP_DEBUG 81 # undef SNMP_MIB_DEBUG 82 # undef SNMP_MSG_DEBUG 72 83 73 # ifdef LOG_ENABLED84 # ifdef LOG_ENABLED 74 85 75 # define LWIP_DEBUGF(_when, _args) \76 do { \77 const VBOX_LOGGROUP _group = (_when) >> LWIP_DEBUGF_LOG_GROUP_SHIFT; \78 if (_group >= LOG_GROUP_DEFAULT) { \79 /* severe => l1; serious => l2; warning => l3; default => l4 */ \80 const unsigned int _level = 1U << (LWIP_DBG_MASK_LEVEL + 1 - ((_when) & LWIP_DBG_MASK_LEVEL)); \81 LogIt(_level, _group, _args); \82 } \83 } while (0)86 # define LWIP_DEBUGF(_when, _args) \ 87 do { \ 88 const VBOX_LOGGROUP _group = (_when) >> LWIP_DEBUGF_LOG_GROUP_SHIFT; \ 89 if (_group >= LOG_GROUP_DEFAULT) { \ 90 /* severe => l1; serious => l2; warning => l3; default => l4 */ \ 91 const unsigned int _level = 1U << (LWIP_DBG_MASK_LEVEL + 1 - ((_when) & LWIP_DBG_MASK_LEVEL)); \ 92 LogIt(_level, _group, _args); \ 93 } \ 94 } while (0) 84 95 85 # else /* !LOG_ENABLED */96 # else /* !LOG_ENABLED */ 86 97 87 # define LWIP_DEBUGF(_when, _args) do { } while (0)98 # define LWIP_DEBUGF(_when, _args) do { } while (0) 88 99 89 # endif /* !LOG_ENABLED */100 # endif /* !LOG_ENABLED */ 90 101 91 102 #endif /* LWIP_DEBUG */ -
trunk/src/VBox/Devices/Network/slirp/ip_icmp.c
r63012 r63016 436 436 /* int code; */ 437 437 438 LogFlowFunc(("ENTER: m = % lx, m_len = %d\n", (long)m, m ? m->m_len : 0));438 LogFlowFunc(("ENTER: m = %p, m_len = %d\n", m, m ? m->m_len : 0)); 439 439 440 440 icmpstat.icps_received++; -
trunk/src/VBox/Devices/Network/slirp/ip_input.c
r62511 r63016 98 98 STAM_PROFILE_START(&pData->StatIP_input, a); 99 99 100 LogFlowFunc(("ENTER: m = % lx\n", (long)m));100 LogFlowFunc(("ENTER: m = %p\n", m)); 101 101 ip = mtod(m, struct ip *); 102 102 Log2(("ip_dst=%RTnaipv4(len:%d) m_len = %d\n", ip->ip_dst, RT_N2H_U16(ip->ip_len), m->m_len)); -
trunk/src/VBox/Devices/Network/slirp/ip_output.c
r63012 r63016 129 129 130 130 #ifdef LOG_ENABLED 131 LogFlowFunc(("ip_output: so = %R[natsock], m0 = % lx\n", so, (long)m0));131 LogFlowFunc(("ip_output: so = %R[natsock], m0 = %p\n", so, m0)); 132 132 #else 133 133 NOREF(so); -
trunk/src/VBox/Devices/Network/slirp/sbuf.c
r63012 r63016 113 113 114 114 STAM_PROFILE_START(&pData->StatIOSBAppend_pf, a); 115 LogFlow(("sbappend: so = % lx, m = %lx, m->m_len = %d\n", (long)so, (long)m, m ? m->m_len : 0));115 LogFlow(("sbappend: so = %p, m = %p, m->m_len = %d\n", so, m, m ? m->m_len : 0)); 116 116 117 117 STAM_COUNTER_INC(&pData->StatIOSBAppend); -
trunk/src/VBox/Devices/Network/slirp/socket.c
r63013 r63016 640 640 if (ret > 0) 641 641 nn += ret; 642 STAM_STATS({ 643 if (ret > 0 && ret !=iov[1].iov_len)644 645 646 647 648 }); 642 # ifdef VBOX_WITH_STATISTICS 643 if (ret > 0 && ret != (ssize_t)iov[1].iov_len) 644 { 645 STAM_COUNTER_INC(&pData->StatIOWrite_rest); 646 STAM_COUNTER_ADD(&pData->StatIOWrite_rest_bytes, (iov[1].iov_len - ret)); 647 } 648 #endif 649 649 } 650 650 Log2(("%s: wrote(2) nn = %d bytes\n", RT_GCC_EXTENSION __PRETTY_FUNCTION__, nn)); … … 679 679 sorecvfrom(PNATState pData, struct socket *so) 680 680 { 681 LogFlowFunc(("sorecvfrom: so = % lx\n", (long)so));681 LogFlowFunc(("sorecvfrom: so = %p\n", so)); 682 682 683 683 #ifdef RT_OS_WINDOWS … … 840 840 int mlen; 841 841 842 LogFlowFunc(("sosendto: so = %R[natsock], m = % lx\n", so, (long)m));842 LogFlowFunc(("sosendto: so = %R[natsock], m = %p\n", so, m)); 843 843 844 844 memset(&addr, 0, sizeof(struct sockaddr)); -
trunk/src/VBox/Devices/Network/slirp/tcp_input.c
r63013 r63016 309 309 STAM_PROFILE_START(&pData->StatTCP_input, counter_input); 310 310 311 LogFlow(("tcp_input: m = %8lx, iphlen = %2d, inso = %R[natsock]\n", 312 (long)m, iphlen, inso)); 311 LogFlow(("tcp_input: m = %p, iphlen = %2d, inso = %R[natsock]\n", m, iphlen, inso)); 313 312 314 313 if (inso != NULL) … … 1258 1257 { 1259 1258 tcpstat.tcps_rcvdupack++; 1260 Log2((" dup ack m = % lx, so = %lx\n", (long)m, (long)so));1259 Log2((" dup ack m = %p, so = %p\n", m, so)); 1261 1260 /* 1262 1261 * If we have outstanding data (other than -
trunk/src/VBox/Devices/Network/slirp/tcp_subr.c
r63013 r63016 127 127 register int tlen; 128 128 129 LogFlowFunc(("ENTER: tp = %R[tcpcb793], ti = %lx, m = %lx, ack = %u, seq = %u, flags = %x\n", 130 tp, (long)ti, (long)m, ack, seq, flags)); 129 LogFlowFunc(("ENTER: tp = %R[tcpcb793], ti = %p, m = %p, ack = %u, seq = %u, flags = %x\n", tp, ti, m, ack, seq, flags)); 131 130 132 131 if (m == 0) -
trunk/src/VBox/Devices/Network/slirp/udp.c
r63013 r63016 123 123 */ 124 124 len = RT_N2H_U16((u_int16_t)uh->uh_ulen); 125 Assert( (ip->ip_len + iphlen == m_length(m, NULL)));125 Assert(ip->ip_len + iphlen == (ssize_t)m_length(m, NULL)); 126 126 127 127 if (ip->ip_len != len) … … 472 472 #endif 473 473 Assert(so->so_type == IPPROTO_UDP); 474 LogFlowFunc(("ENTER: so = %R[natsock], m = %p, saddr = %RTnaipv4\n", 475 so, (long)m, addr->sin_addr.s_addr)); 474 LogFlowFunc(("ENTER: so = %R[natsock], m = %p, saddr = %RTnaipv4\n", so, m, addr->sin_addr.s_addr)); 476 475 477 476 if (so->so_laddr.s_addr == INADDR_ANY) -
trunk/src/VBox/Devices/Storage/Debug.cpp
r62506 r63016 958 958 * Log the write parameters mode page into a given buffer. 959 959 */ 960 static int scsiLogWriteParamsModePage(char *pszBuffer, size_t cchBuffer, 961 uint8_t *pbModePage, size_t cbModePage) 960 static int scsiLogWriteParamsModePage(char *pszBuffer, size_t cchBuffer, uint8_t *pbModePage, size_t cbModePage) 962 961 { 962 RT_NOREF(cbModePage); 963 963 size_t cch = 0; 964 964 const char *pcsz = NULL; … … 1120 1120 * @param cbCueSheet Size of the cue sheet buffer in bytes. 1121 1121 */ 1122 int SCSILogCueSheet(char *pszBuffer, size_t cchBuffer, uint8_t *pbCueSheet, 1123 size_t cbCueSheet) 1122 int SCSILogCueSheet(char *pszBuffer, size_t cchBuffer, uint8_t *pbCueSheet, size_t cbCueSheet) 1124 1123 { 1125 1124 int rc = VINF_SUCCESS; 1126 1125 size_t cch = 0; 1127 unsignedcCueSheetEntries = cbCueSheet / 8;1126 size_t cCueSheetEntries = cbCueSheet / 8; 1128 1127 1129 1128 AssertReturn(cbCueSheet % 8 == 0, VERR_INVALID_PARAMETER); 1130 1129 1131 for ( unsignedi = 0; i < cCueSheetEntries; i++)1130 for (size_t i = 0; i < cCueSheetEntries; i++) 1132 1131 { 1133 1132 cch = RTStrPrintf(pszBuffer, cchBuffer, -
trunk/src/VBox/Devices/USB/DevOHCI.cpp
r62956 r63016 1687 1687 DECLINLINE(void) ohciDumpITdQueueCore(POHCI pThis, uint32_t GCPhysHead, uint32_t GCPhysTail, bool fFull) 1688 1688 { 1689 RT_NOREF(fFull); 1689 1690 uint32_t GCPhys = GCPhysHead; 1690 1691 int cMax = 100; … … 1724 1725 DECLINLINE(void) ohciDumpEdList(POHCI pThis, uint32_t GCPhysHead, const char *pszMsg, bool fTDs) 1725 1726 { 1727 RT_NOREF(fTDs); 1726 1728 uint32_t GCPhys = GCPhysHead; 1727 1729 if (pszMsg) … … 1765 1767 Assert(GCPhys != GCPhysHead); 1766 1768 } 1767 Log4(("\n"));1769 /* not reached */ 1768 1770 } 1769 1771 -
trunk/src/VBox/Devices/VMMDev/VMMDev.cpp
r62891 r63016 2272 2272 * 2273 2273 * @returns VBox status code that the guest should see. 2274 * @param pThis The VMMDev instance data. 2275 * @param pReqHdr The header of the request to handle. 2276 */ 2277 static int vmmdevReqHandler_LogString(PVMMDEV pThis, VMMDevRequestHeader *pReqHdr) 2274 * @param pReqHdr The header of the request to handle. 2275 */ 2276 static int vmmdevReqHandler_LogString(VMMDevRequestHeader *pReqHdr) 2278 2277 { 2279 2278 VMMDevReqLogString *pReq = (VMMDevReqLogString *)pReqHdr; … … 2719 2718 #ifdef DEBUG 2720 2719 case VMMDevReq_LogString: 2721 pReqHdr->rc = vmmdevReqHandler_LogString(p This, pReqHdr);2720 pReqHdr->rc = vmmdevReqHandler_LogString(pReqHdr); 2722 2721 break; 2723 2722 #endif
Note:
See TracChangeset
for help on using the changeset viewer.