VirtualBox

Changeset 107875 in vbox for trunk


Ignore:
Timestamp:
Jan 21, 2025 3:18:32 PM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
167087
Message:

UsbNet: bugref:10779 Logging tidying

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r107871 r107875  
    11091109{
    11101110    RT_NOREF(pszWhy);
    1111     Log(("usbNetCompleteStall/#%u: pUrb=%p:%s: %s\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc, pszWhy));
     1111    LogFunc(("/#%u/ pUrb=%p:%s: %s\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc, pszWhy));
    11121112
    11131113    pUrb->enmStatus = VUSBSTATUS_STALL;
    … …  
    11331133static int usbNetCompleteOk(PUSBNET pThis, PVUSBURB pUrb, size_t cbData)
    11341134{
    1135     Log(("usbNetCompleteOk/#%u: pUrb=%p:%s cbData=%#zx\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc, cbData));
     1135    LogFunc(("/#%u/ pUrb=%p:%s cbData=%#zx\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc, cbData));
    11361136
    11371137    pUrb->enmStatus = VUSBSTATUS_OK;
    … …  
    11491149static void usbNetCompleteNotificationOk(PUSBNET pThis, PVUSBURB pUrb, const void *pSrc, size_t cbSrc)
    11501150{
    1151     Log(("usbNetCompleteNotificationOk/#%u: pUrb=%p:%s (cbData=%#x) cbSrc=%#zx\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc, pUrb->cbData, cbSrc));
     1151    LogFunc(("/#%u/ pUrb=%p:%s (cbData=%#x) cbSrc=%#zx\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc, pUrb->cbData, cbSrc));
    11521152
    11531153    pUrb->enmStatus = VUSBSTATUS_OK;
    … …  
    12501250    PUSBNET pThis = RT_FROM_MEMBER(pInterface, USBNET, Lun0.INetworkDown);
    12511251
     1252    LogFlowFunc(("/#%u/ pInterface=%p cMillies=%u\n", pThis->pUsbIns->iInstance, pInterface, cMillies));
    12521253    RTCritSectEnter(&pThis->CritSect);
    12531254    if (!usbNetQueueIsEmpty(&pThis->ToHostQueue) || pThis->fSuspended)
    … …  
    12591260    RTCritSectLeave(&pThis->CritSect);
    12601261
     1262    LogFlowFunc(("/#%u/ pInterface=%p waiting for hEvtToHostQueue\n", pThis->pUsbIns->iInstance, pInterface));
    12611263    int rc = RTSemEventWait(pThis->hEvtToHostQueue, cMillies);
    12621264    ASMAtomicXchgBool(&pThis->fHaveToHostQueueWaiter, false);
     1265    LogFlowFunc(("/#%u/ pInterface=%p received hEvtToHostQueue\n", pThis->pUsbIns->iInstance, pInterface));
    12631266    return rc;
    12641267}
    … …  
    12771280    PUSBNET pThis = RT_FROM_MEMBER(pInterface, USBNET, Lun0.INetworkDown);
    12781281
     1282    LogFlowFunc(("/#%u/ pInterface=%p cb=%u\n", pThis->pUsbIns->iInstance, pInterface, cb));
    12791283    RTCritSectEnter(&pThis->CritSect);
    12801284
    … …  
    12821286    {
    12831287        RTCritSectLeave(&pThis->CritSect);
     1288        LogFlowFunc(("/#%u/ return %Rrc due to %s\n", pThis->pUsbIns->iInstance, VINF_SUCCESS, pThis->fSuspended ? "being suspended" : "empty host queue"));
    12841289        return VINF_SUCCESS;
    12851290    }
    … …  
    12971302    if (pUrb->cbData < sizeof(USBNCMNTH16) + sizeof(USBNCMNDP16) + cb)
    12981303    {
    1299         Log(("UsbNet: Receive URB too small (%#x vs %#x)\n", pUrb->cbData, sizeof(USBNCMNTH16) + sizeof(USBNCMNDP16) + cb));
     1304        LogFunc(("/#%u/ Receive URB too small (%#x vs %#x)\n", pThis->pUsbIns->iInstance, pUrb->cbData,
     1305             sizeof(USBNCMNTH16) + sizeof(USBNCMNDP16) + cb));
    13001306        pUrb->enmStatus = VUSBSTATUS_DATA_OVERRUN;
    13011307        usbNetLinkDone(pThis, pUrb);
    … …  
    13311337    RTCritSectLeave(&pThis->CritSect);
    13321338
    1333     LogFlow(("%s: return %Rrc\n", __FUNCTION__, VINF_SUCCESS));
     1339    LogFlowFunc(("/#%u/ return %Rrc\n", pThis->pUsbIns->iInstance, VINF_SUCCESS));
    13341340    return VINF_SUCCESS;
    13351341}
    … …  
    13411347{
    13421348    RT_NOREF(pInterface);
     1349#ifdef LOG_ENABLED
     1350    PUSBNET pThis = RT_FROM_MEMBER(pInterface, USBNET, Lun0.INetworkDown);
     1351    LogFlowFunc(("/#%u/ pInterface=%p\n", pThis->pUsbIns->iInstance, pInterface));
     1352#endif
    13431353}
    13441354
    … …  
    13531363    PUSBNET pThis = RT_FROM_MEMBER(pInterface, USBNET, Lun0.INetworkConfig);
    13541364
    1355     LogFlowFunc(("#%d\n", pThis->pUsbIns->iInstance));
     1365    LogFlowFunc(("/#%u/\n", pThis->pUsbIns->iInstance));
    13561366    memcpy(pMac, &pThis->MacConfigured, sizeof(*pMac));
    13571367    return VINF_SUCCESS;
    … …  
    13661376    PUSBNET pThis = RT_FROM_MEMBER(pInterface, USBNET, Lun0.INetworkConfig);
    13671377
     1378    LogFlowFunc(("/#%u/\n", pThis->pUsbIns->iInstance));
    13681379    if (pThis->fLinkUp && !pThis->fLinkTempDown)
    13691380        return PDMNETWORKLINKSTATE_UP;
    … …  
    13901401    RT_NOREF(pUsbIns, hTimer);
    13911402
    1392     LogFlowFunc(("#%d\n", pUsbIns->iInstance));
     1403    LogFlowFunc(("/#%u/\n", pUsbIns->iInstance));
    13931404
    13941405    /** @todo Do we really care for potential races with link state? */
    … …  
    14081419    bool fLinkUp = enmState == PDMNETWORKLINKSTATE_UP;
    14091420
    1410     LogFlowFunc(("#%d enmState=%d\n", pThis->pUsbIns->iInstance, enmState));
     1421    LogFlowFunc(("/#%u/ enmState=%d\n", pThis->pUsbIns->iInstance, enmState));
    14111422    AssertMsgReturn(enmState > PDMNETWORKLINKSTATE_INVALID && enmState <= PDMNETWORKLINKSTATE_DOWN_RESUME,
    14121423                    ("Invalid link state: enmState=%d\n", enmState), VERR_INVALID_PARAMETER);
    … …  
    14351446{
    14361447    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    1437     LogFlow(("usbNetUrbReap/#%u: cMillies=%u\n", pUsbIns->iInstance, cMillies));
     1448    LogFlowFunc(("/#%u/ cMillies=%u\n", pUsbIns->iInstance, cMillies));
    14381449
    14391450    RTCritSectEnter(&pThis->CritSect);
    … …  
    14571468
    14581469    if (pUrb)
    1459         Log(("usbNetUrbReap/#%u: pUrb=%p:%s\n", pUsbIns->iInstance, pUrb, pUrb->pszDesc));
     1470        LogFunc(("/#%u/ pUrb=%p:%s\n", pUsbIns->iInstance, pUrb, pUrb->pszDesc));
    14601471    return pUrb;
    14611472}
    … …  
    14681479{
    14691480    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    1470     LogFlow(("usbNetUrbReap/#%u:\n", pUsbIns->iInstance));
     1481    LogFlowFunc(("/#%u/\n", pUsbIns->iInstance));
    14711482
    14721483    return RTSemEventSignal(pThis->hEvtDoneQueue);
    … …  
    14801491{
    14811492    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    1482     LogFlow(("usbNetUrbCancel/#%u: pUrb=%p:%s\n", pUsbIns->iInstance, pUrb, pUrb->pszDesc));
     1493    LogFlowFunc(("/#%u/ pUrb=%p:%s\n", pUsbIns->iInstance, pUrb, pUrb->pszDesc));
    14831494    RTCritSectEnter(&pThis->CritSect);
    14841495
    … …  
    16561667        RTSemEventSignal(pThis->hEvtToHostQueue);
    16571668
    1658     LogFlow(("usbNetHandleBulkDevToHost: Added %p:%s to the to-host queue\n", pUrb, pUrb->pszDesc));
     1669    LogFlowFunc(("/#%u/ Added %p:%s to the to-host queue\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc));
    16591670    return VINF_SUCCESS;
    16601671}
    … …  
    16981709        usbNetQueueAddTail(&pThis->ToHostIntrQueue, pUrb);
    16991710
    1700     LogFlow(("usbNetHandleIntrDevToHost: Added %p:%s to the to-host interrupt queue\n", pUrb, pUrb->pszDesc));
     1711    LogFlowFunc(("/#%u/ Added %p:%s to the to-host interrupt queue\n", pThis->pUsbIns->iInstance, pUrb, pUrb->pszDesc));
    17011712    return VINF_SUCCESS;
    17021713}
    … …  
    17111722DECLHIDDEN(void) usbNetLinkStateNotify(PUSBNET pThis, PDMNETWORKLINKSTATE enmLinkState)
    17121723{
    1713     LogFlowFunc(("#%d enmLinkState=%d\n", pThis->pUsbIns->iInstance, enmLinkState));
     1724    LogFlowFunc(("/#%u/ enmLinkState=%d\n", pThis->pUsbIns->iInstance, enmLinkState));
    17141725    RTCritSectEnter(&pThis->CritSect);
    17151726    /* Trigger notifications */
    … …  
    19041915{
    19051916    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    1906     LogFlow(("usbNetQueue/#%u: pUrb=%p:%s EndPt=%#x\n", pUsbIns->iInstance, pUrb, pUrb->pszDesc, pUrb->EndPt));
     1917    LogFlowFunc(("/#%u/ pUrb=%p:%s EndPt=%#x\n", pUsbIns->iInstance, pUrb, pUrb->pszDesc, pUrb->EndPt));
    19071918    RTCritSectEnter(&pThis->CritSect);
    19081919
    … …  
    19491960{
    19501961    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    1951     LogFlow(("usbNetUsbClearHaltedEndpoint/#%u: uEndpoint=%#x\n", pUsbIns->iInstance, uEndpoint));
     1962    LogFlowFunc(("/#%u/ uEndpoint=%#x\n", pUsbIns->iInstance, uEndpoint));
    19521963
    19531964    if ((uEndpoint & ~0x80) < RT_ELEMENTS(pThis->aEps))
    … …  
    19691980    RT_NOREF(bInterfaceNumber);
    19701981    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    1971     LogFlow(("usbNetUsbSetInterface/#%u: bInterfaceNumber=%u bAlternateSetting=%u\n", pUsbIns->iInstance, bInterfaceNumber, bAlternateSetting));
     1982    LogFlowFunc(("/#%u/ bInterfaceNumber=%u bAlternateSetting=%u\n", pUsbIns->iInstance, bInterfaceNumber, bAlternateSetting));
    19721983    Assert(bAlternateSetting == 0 || bAlternateSetting == 1);
    19731984    if (pThis->bAlternateSetting != bAlternateSetting)
    … …  
    19992010    RT_NOREF(pvOldCfgDesc, pvOldIfState,  pvNewCfgDesc);
    20002011    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    2001     LogFlow(("usbNetUsbSetConfiguration/#%u: bConfigurationValue=%u\n", pUsbIns->iInstance, bConfigurationValue));
     2012    LogFlowFunc(("/#%u/ bConfigurationValue=%u\n", pUsbIns->iInstance, bConfigurationValue));
    20022013    Assert(bConfigurationValue == 1);
    20032014    RTCritSectEnter(&pThis->CritSect);
    … …  
    20212032{
    20222033    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    2023     LogFlow(("usbNetUsbGetDescriptorCache/#%u:\n", pUsbIns->iInstance));
     2034    LogFlowFunc(("/#%u/\n", pUsbIns->iInstance));
    20242035    return &pThis->UsbDescCache;
    20252036}
    … …  
    20332044    RT_NOREF(fResetOnLinux);
    20342045    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    2035     LogFlow(("usbNetUsbReset/#%u:\n", pUsbIns->iInstance));
     2046    LogFlowFunc(("/#%u/\n", pUsbIns->iInstance));
    20362047    RTCritSectEnter(&pThis->CritSect);
    20372048
    … …  
    20512062    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    20522063
    2053     LogFlow(("usbNetDriverAttach/#%u:\n", pUsbIns->iInstance));
     2064    LogFlowFunc(("/#%u/\n", pUsbIns->iInstance));
    20542065
    20552066    AssertMsg(iLUN == 0, ("UsbNet: No other LUN than 0 is supported\n"));
    … …  
    20922103    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    20932104
    2094     LogFlow(("usbNetDriverDetach/#%u:\n", pUsbIns->iInstance));
     2105    LogFlowFunc(("/#%u/\n", pUsbIns->iInstance));
    20952106
    20962107    AssertMsg(iLUN == 0, ("UsbNet: No other LUN than 0 is supported\n"));
    … …  
    21132124    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    21142125
     2126    LogFlowFunc(("/#%u/\n", pUsbIns->iInstance));
    21152127    int rc = usbNetResetWorker(pThis, NULL, false /*fSetConfig*/);
    21162128    AssertRC(rc);
    … …  
    21612173    PDMUSB_CHECK_VERSIONS_RETURN_VOID(pUsbIns);
    21622174    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
    2163     LogFlow(("usbNetDestruct/#%u:\n", pUsbIns->iInstance));
     2175    LogFlowFunc(("/#%u/\n", pUsbIns->iInstance));
    21642176
    21652177    PDMUsbHlpTimerDestroy(pUsbIns, pThis->hTimerLinkUp);
    … …  
    22022214    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
    22032215
    2204     Log(("usbNetConstruct/#%u:\n", iInstance));
     2216    LogFlowFunc(("/#%u/\n", iInstance));
    22052217
    22062218    /*
Note: See TracChangeset for help on using the changeset viewer.

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