VirtualBox

Changeset 11266 in vbox for trunk/src/VBox/Devices/Network


Ignore:
Timestamp:
Aug 8, 2008 4:14:51 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
34348
Message:

Devices: VBOX_SUCCESS/FAILURE -> RT_SUCCESS/FAILURE.

Location:
trunk/src/VBox/Devices/Network
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r11259 r11266  
    461461                     */
    462462                    rc = drvIntNetAsyncIoWaitForSpace(pThis);
    463                     if (VBOX_FAILURE(rc))
     463                    if (RT_FAILURE(rc))
    464464                    {
    465465                        STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
    … …  
    497497        STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
    498498        int rc = pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_WAIT, &WaitReq, sizeof(WaitReq));
    499         if (    VBOX_FAILURE(rc)
     499        if (    RT_FAILURE(rc)
    500500            &&  rc != VERR_TIMEOUT
    501501            &&  rc != VERR_INTERRUPTED)
    … …  
    533533            {
    534534                int rc = RTSemEventWait(pThis->EventSuspended, 30000);
    535                 if (    VBOX_FAILURE(rc)
     535                if (    RT_FAILURE(rc)
    536536                    &&  rc != VERR_TIMEOUT)
    537537                {
    … …  
    546546                int rc = drvIntNetAsyncIoRun(pThis);
    547547                if (    rc != VERR_STATE_CHANGED
    548                     &&  VBOX_FAILURE(rc))
     548                    &&  RT_FAILURE(rc))
    549549                {
    550550                    LogFlow(("drvIntNetAsyncIoThread: returns %Vrc\n", rc));
    … …  
    795795     */
    796796    rc = CFGMR3QueryString(pCfgHandle, "Network", OpenReq.szNetwork, sizeof(OpenReq.szNetwork));
    797     if (VBOX_FAILURE(rc))
     797    if (RT_FAILURE(rc))
    798798        return PDMDRV_SET_ERROR(pDrvIns, rc,
    799799                                N_("Configuration error: Failed to get the \"Network\" value"));
    … …  
    807807    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    808808        u32TrunkType = kIntNetTrunkType_None;
    809     else if (VBOX_FAILURE(rc))
     809    else if (RT_FAILURE(rc))
    810810        return PDMDRV_SET_ERROR(pDrvIns, rc,
    811811                                N_("Configuration error: Failed to get the \"TrunkType\" value"));
    … …  
    818818    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    819819        OpenReq.szTrunk[0] = '\0';
    820     else if (VBOX_FAILURE(rc))
     820    else if (RT_FAILURE(rc))
    821821        return PDMDRV_SET_ERROR(pDrvIns, rc,
    822822                                N_("Configuration error: Failed to get the \"Trunk\" value"));
    … …  
    830830    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    831831        fRestrictAccess = true;
    832     else if (VBOX_FAILURE(rc))
     832    else if (RT_FAILURE(rc))
    833833        return PDMDRV_SET_ERROR(pDrvIns, rc,
    834834                                N_("Configuration error: Failed to get the \"RestrictAccess\" value"));
    … …  
    841841    bool fSharedMacOnWire;
    842842    rc = CFGMR3QueryBoolDef(pCfgHandle, "SharedMacOnWire", &fSharedMacOnWire, false);
    843     if (VBOX_FAILURE(rc))
     843    if (RT_FAILURE(rc))
    844844        return PDMDRV_SET_ERROR(pDrvIns, rc,
    845845                                N_("Configuration error: Failed to get the \"SharedMacOnWire\" value"));
    … …  
    853853    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    854854        OpenReq.cbRecv = 218 * _1K ;
    855     else if (VBOX_FAILURE(rc))
     855    else if (RT_FAILURE(rc))
    856856        return PDMDRV_SET_ERROR(pDrvIns, rc,
    857857                                N_("Configuration error: Failed to get the \"ReceiveBufferSize\" value"));
    … …  
    868868    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    869869        OpenReq.cbSend = 36*_1K;
    870     else if (VBOX_FAILURE(rc))
     870    else if (RT_FAILURE(rc))
    871871        return PDMDRV_SET_ERROR(pDrvIns, rc,
    872872                                N_("Configuration error: Failed to get the \"SendBufferSize\" value"));
    … …  
    884884    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    885885        pThis->fActivateEarlyDeactivateLate = false;
    886     else if (VBOX_FAILURE(rc))
     886    else if (RT_FAILURE(rc))
    887887        return PDMDRV_SET_ERROR(pDrvIns, rc,
    888888                                N_("Configuration error: Failed to get the \"IsService\" value"));
    … …  
    920920     */
    921921    rc = RTSemEventCreate(&pThis->EventSuspended);
    922     if (VBOX_FAILURE(rc))
     922    if (RT_FAILURE(rc))
    923923        return rc;
    924924
    … …  
    928928    OpenReq.hIf = INTNET_HANDLE_INVALID;
    929929    rc = pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_OPEN, &OpenReq, sizeof(OpenReq));
    930     if (VBOX_FAILURE(rc))
     930    if (RT_FAILURE(rc))
    931931        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
    932932                                   N_("Failed to open/create the internal network '%s'"), pThis->szNetwork);
    … …  
    945945    GetRing3BufferReq.pRing3Buf = NULL;
    946946    rc = pDrvIns->pDrvHlp->pfnSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_GET_RING3_BUFFER, &GetRing3BufferReq, sizeof(GetRing3BufferReq));
    947     if (VBOX_FAILURE(rc))
     947    if (RT_FAILURE(rc))
    948948        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
    949949                                   N_("Failed to get ring-3 buffer for the newly created interface to '%s'"), pThis->szNetwork);
    … …  
    956956     */
    957957    rc = RTThreadCreate(&pThis->Thread, drvIntNetAsyncIoThread, pThis, _128K, RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "INTNET");
    958     if (VBOX_FAILURE(rc))
     958    if (RT_FAILURE(rc))
    959959    {
    960960        AssertRC(rc);

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

    r11170 r11266  
    378378            if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    379379                fUDP = false;
    380             else if (VBOX_FAILURE(rc))
     380            else if (RT_FAILURE(rc))
    381381                return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"UDP\" boolean failed"), iInstance);
    382382        }
    383         else if (VBOX_SUCCESS(rc))
     383        else if (RT_SUCCESS(rc))
    384384        {
    385385            if (!RTStrICmp(szProtocol, "TCP"))
    … …  
    396396        int32_t iHostPort;
    397397        rc = CFGMR3QueryS32(pNode, "HostPort", &iHostPort);
    398         if (VBOX_FAILURE(rc))
     398        if (RT_FAILURE(rc))
    399399            return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"HostPort\" integer failed"), iInstance);
    400400
    … …  
    402402        int32_t iGuestPort;
    403403        rc = CFGMR3QueryS32(pNode, "GuestPort", &iGuestPort);
    404         if (VBOX_FAILURE(rc))
     404        if (RT_FAILURE(rc))
    405405            return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"GuestPort\" integer failed"), iInstance);
    406406
    … …  
    411411            RTStrPrintf(szGuestIP, sizeof(szGuestIP), "%d.%d.%d.%d",
    412412                        (Network & 0xFF000000) >> 24, (Network & 0xFF0000) >> 16, (Network & 0xFF00) >> 8, (Network & 0xE0) | 15);
    413         else if (VBOX_FAILURE(rc))
     413        else if (RT_FAILURE(rc))
    414414            return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"GuestIP\" string failed"), iInstance);
    415415        struct in_addr GuestIP;
    … …  
    514514    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    515515        fPassDomain = true;
    516     else if (VBOX_FAILURE(rc))
     516    else if (RT_FAILURE(rc))
    517517        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"PassDomain\" boolean failed"), pDrvIns->iInstance);
    518518
    519519    rc = CFGMR3QueryStringAlloc(pCfgHandle, "TFTPPrefix", &pData->pszTFTPPrefix);
    520     if (VBOX_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
     520    if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
    521521        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"TFTPPrefix\" string failed"), pDrvIns->iInstance);
    522522    rc = CFGMR3QueryStringAlloc(pCfgHandle, "BootFile", &pData->pszBootFile);
    523     if (VBOX_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
     523    if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
    524524        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"BootFile\" string failed"), pDrvIns->iInstance);
    525525
    … …  
    540540    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    541541        RTStrPrintf(szNetwork, sizeof(szNetwork), "10.0.%d.0/24", pDrvIns->iInstance + 2);
    542     else if (VBOX_FAILURE(rc))
     542    else if (RT_FAILURE(rc))
    543543        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"Network\" string failed"), pDrvIns->iInstance);
    544544
    … …  
    556556     */
    557557    rc = RTCritSectInit(&pData->CritSect);
    558     if (VBOX_FAILURE(rc))
     558    if (RT_FAILURE(rc))
    559559        return rc;
    560560#if 0
    561561    rc = RTSemEventCreate(&g_EventSem);
    562     if (VBOX_SUCCESS(rc))
     562    if (RT_SUCCESS(rc))
    563563    {
    564564        /*
    … …  
    567567        g_fThreadTerm = false;
    568568        rc = RTThreadCreate(&g_ThreadSelect, drvNATSelectThread, 0, NULL, "NATSEL");
    569         if (VBOX_SUCCESS(rc))
     569        if (RT_SUCCESS(rc))
    570570        {
    571571#endif
    … …  
    575575             */
    576576            rc = slirp_init(&pData->pNATState, &szNetAddr[0], Netmask, fPassDomain, pData->pszTFTPPrefix, pData->pszBootFile, pData);
    577             if (VBOX_SUCCESS(rc))
     577            if (RT_SUCCESS(rc))
    578578            {
    579579                int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pData, pCfgHandle, Network);
    580                 if (VBOX_SUCCESS(rc2))
     580                if (RT_SUCCESS(rc2))
    581581                {
    582582                    /*

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

    r11157 r11266  
    346346    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    347347        RTStrPrintf(pThis->szFilename, sizeof(pThis->szFilename), "./VBox-%x.pcap", RTProcSelf());
    348     else if (VBOX_FAILURE(rc))
     348    else if (RT_FAILURE(rc))
    349349    {
    350350        AssertMsgFailed(("Failed to query \"File\", rc=%Vrc.\n", rc));
    … …  
    379379    if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
    380380        pThis->pConnector = NULL;
    381     else if (VBOX_SUCCESS(rc))
     381    else if (RT_SUCCESS(rc))
    382382    {
    383383        pThis->pConnector = (PPDMINETWORKCONNECTOR)pBaseDown->pfnQueryInterface(pBaseDown, PDMINTERFACE_NETWORK_CONNECTOR);
    … …  
    398398     */
    399399    rc = RTCritSectInit(&pThis->Lock);
    400     if (VBOX_FAILURE(rc))
     400    if (RT_FAILURE(rc))
    401401        return rc;
    402402
    … …  
    406406    rc = RTFileOpen(&pThis->File, pThis->szFilename,
    407407                    RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE | RTFILE_O_DENY_WRITE);
    408     if (VBOX_FAILURE(rc))
     408    if (RT_FAILURE(rc))
    409409    {
    410410        AssertMsgFailed(("Failed to create file '%s' for writing. rc=%Vrc\n", pThis->szFilename, rc));

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

    r11246 r11266  
    284284            rc = RTFileRead(pData->FileDevice, achBuf, sizeof(achBuf), &cbRead);
    285285#endif
    286             if (VBOX_SUCCESS(rc))
     286            if (RT_SUCCESS(rc))
    287287            {
    288288                /*
    … …  
    932932#if defined(RT_OS_SOLARIS)   /** @todo Other platforms' TAP code should be moved here from ConsoleImpl & VBoxBFE. */
    933933    rc = CFGMR3QueryStringAlloc(pCfgHandle, "TAPSetupApplication", &pData->pszSetupApplication);
    934     if (VBOX_SUCCESS(rc))
     934    if (RT_SUCCESS(rc))
    935935    {
    936936        if (!RTPathExists(pData->pszSetupApplication))
    … …  
    942942
    943943    rc = CFGMR3QueryStringAlloc(pCfgHandle, "TAPTerminateApplication", &pData->pszTerminateApplication);
    944     if (VBOX_SUCCESS(rc))
     944    if (RT_SUCCESS(rc))
    945945    {
    946946        if (!RTPathExists(pData->pszTerminateApplication))
    … …  
    953953# ifdef VBOX_WITH_CROSSBOW
    954954    rc = CFGMR3QueryBytes(pCfgHandle, "MAC", &pData->MacAddress, sizeof(pData->MacAddress));
    955     if (VBOX_FAILURE(rc))
     955    if (RT_FAILURE(rc))
    956956        return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Configuration error: Failed to query \"MAC\""));
    957957# endif
    958958
    959959    rc = CFGMR3QueryStringAlloc(pCfgHandle, "Device", &pData->pszDeviceName);
    960     if (VBOX_FAILURE(rc))
     960    if (RT_FAILURE(rc))
    961961        pData->fStatic = false;
    962962
    … …  
    965965    {
    966966        rc = drvTAPSetupApplication(pData);
    967         if (VBOX_FAILURE(rc))
     967        if (RT_FAILURE(rc))
    968968            return PDMDrvHlpVMSetError(pDrvIns, VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,
    969969                                       N_("Error running TAP setup application. rc=%d"), rc);
    … …  
    983983    rc = SolarisTAPAttach(pData);
    984984# endif
    985     if (VBOX_FAILURE(rc))
     985    if (RT_FAILURE(rc))
    986986        return rc;
    987987
    … …  
    990990    int32_t iFile;
    991991    rc = CFGMR3QueryS32(pCfgHandle, "FileHandle", &iFile);
    992     if (VBOX_FAILURE(rc))
     992    if (RT_FAILURE(rc))
    993993        return PDMDRV_SET_ERROR(pDrvIns, rc,
    994994                                N_("Configuration error: Query for \"FileHandle\" 32-bit signed integer failed"));

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

    r11157 r11266  
    450450    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    451451        strcpy(pThis->szDevice, "\\DEV\\TAP$");
    452     else if (VBOX_FAILURE(rc))
     452    else if (RT_FAILURE(rc))
    453453        return PDMDRV_SET_ERROR(pDrvIns, rc,
    454454                                N_("Configuration error: Query for \"Device\" failed"));
    … …  
    458458    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
    459459        iConnectTo = -1;
    460     else if (VBOX_FAILURE(rc))
     460    else if (RT_FAILURE(rc))
    461461        return PDMDRV_SET_ERROR(pDrvIns, rc,
    462462                                N_("Configuration error: Query for \"ConnectTo\" failed"));
    … …  
    467467     */
    468468    rc = RTFileOpen(&pThis->hDevice, pThis->szDevice, RTFILE_O_DENY_NONE | RTFILE_O_READ);
    469     if (VBOX_FAILURE(rc))
     469    if (RT_FAILURE(rc))
    470470        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
    471471                                   N_("Failed to open tap device '%s'"), pThis->szDevice);
    … …  
    482482    else if (Parm[0])
    483483        rc = VERR_GENERAL_FAILURE;
    484     if (VBOX_FAILURE(rc))
     484    if (RT_FAILURE(rc))
    485485        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
    486486                                   N_("Failed to query LanNumber! orc=%d Parm={%ld,%ld}"),
    … …  
    509509        else if (Parm[0])
    510510            rc = VERR_GENERAL_FAILURE;
    511         if (VBOX_FAILURE(rc))
     511        if (RT_FAILURE(rc))
    512512            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
    513513                                       N_("Failed to connect %d to %d! orc=%d Parm={%ld,%ld}"),

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

    r8773 r11266  
    381381    char *pszHostDriver = NULL;
    382382    rc = CFGMR3QueryStringAlloc(pCfgHandle, "HostInterfaceName", &pszHostDriver);
    383     if (VBOX_FAILURE(rc))
     383    if (RT_FAILURE(rc))
    384384        return PDMDRV_SET_ERROR(pDrvIns, rc,
    385385                                N_("Configuration error: query for \"HostInterfaceName\" failed"));
    … …  
    391391
    392392    rc = CFGMR3QueryBytes(pCfgHandle, "GUID", szDriverGUID, sizeof(szDriverGUID));
    393     if (VBOX_FAILURE(rc))
     393    if (RT_FAILURE(rc))
    394394        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
    395395                                N_("Configuration error: could not query GUID"));
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