VirtualBox

Ignore:
Timestamp:
Oct 12, 2015 3:13:47 PM (9 years ago)
Author:
vboxsync
Message:

VBoxGuestR0LibSharedFolders: Prefixed functions ('vbox' wasn't a very good one). Hope I found all places these functions are called...

Location:
trunk/src/VBox/Additions/linux/sharedfolders
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

    r58143 r58195  
    6363                       ;
    6464
    65     LogFunc(("sf_dir_open(): calling vboxCallCreate, folder %s, flags %#x\n",
     65    LogFunc(("sf_dir_open(): calling VbglR0SfCreate, folder %s, flags %#x\n",
    6666             sf_i->path->String.utf8, params.CreateFlags));
    67     rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, &params);
     67    rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, &params);
    6868    if (RT_SUCCESS(rc))
    6969    {
    … …  
    7777            err = -ENOENT;
    7878
    79         rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
     79        rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
    8080        if (RT_FAILURE(rc))
    81             LogFunc(("sf_dir_open(): vboxCallClose(%s) after err=%d failed rc=%Rrc\n",
     81            LogFunc(("sf_dir_open(): VbglR0SfClose(%s) after err=%d failed rc=%Rrc\n",
    8282                     sf_i->path->String.utf8, err, rc));
    8383    }
    … …  
    174174                           ;
    175175
    176         LogFunc(("sf_getdent: calling vboxCallCreate, folder %s, flags %#x\n",
     176        LogFunc(("sf_getdent: calling VbglR0SfCreate, folder %s, flags %#x\n",
    177177                  sf_i->path->String.utf8, params.CreateFlags));
    178         rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, &params);
     178        rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, &params);
    179179        if (RT_FAILURE(rc))
    180180        {
    181             LogFunc(("vboxCallCreate(%s) failed rc=%Rrc\n",
     181            LogFunc(("VbglR0SfCreate(%s) failed rc=%Rrc\n",
    182182                        sf_i->path->String.utf8, rc));
    183183            return -EPERM;
    … …  
    193193        sf_dir_info_empty(sf_d);
    194194        err = sf_dir_read_all(sf_g, sf_i, sf_d, params.Handle);
    195         rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
     195        rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
    196196        if (RT_FAILURE(rc))
    197             LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
     197            LogFunc(("VbglR0SfClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
    198198        if (err)
    199199            return err;
    … …  
    562562    params.Info.Attr.enmAdditional = RTFSOBJATTRADD_NOTHING;
    563563
    564     LogFunc(("sf_create_aux: calling vboxCallCreate, folder %s, flags %#x\n",
     564    LogFunc(("sf_create_aux: calling VbglR0SfCreate, folder %s, flags %#x\n",
    565565              path->String.utf8, params.CreateFlags));
    566     rc = vboxCallCreate(&client_handle, &sf_g->map, path, &params);
     566    rc = VbglR0SfCreate(&client_handle, &sf_g->map, path, &params);
    567567    if (RT_FAILURE(rc))
    568568    {
    … …  
    573573        }
    574574        err = -EPROTO;
    575         LogFunc(("(%d): vboxCallCreate(%s) failed rc=%Rrc\n",
     575        LogFunc(("(%d): VbglR0SfCreate(%s) failed rc=%Rrc\n",
    576576                    fDirectory, sf_i->path->String.utf8, rc));
    577577        goto fail1;
    … …  
    602602    if (fDirectory)
    603603    {
    604         rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
     604        rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
    605605        if (RT_FAILURE(rc))
    606             LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", fDirectory, rc));
     606            LogFunc(("(%d): VbglR0SfClose failed rc=%Rrc\n", fDirectory, rc));
    607607    }
    608608
    … …  
    611611
    612612fail2:
    613     rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
     613    rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
    614614    if (RT_FAILURE(rc))
    615         LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", fDirectory, rc));
     615        LogFunc(("(%d): VbglR0SfClose failed rc=%Rrc\n", fDirectory, rc));
    616616
    617617fail1:
    … …  
    691691        && ((dentry->d_inode->i_mode & S_IFLNK) == S_IFLNK))
    692692        fFlags |= SHFL_REMOVE_SYMLINK;
    693     rc = vboxCallRemove(&client_handle, &sf_g->map, path, fFlags);
     693    rc = VbglR0SfRemove(&client_handle, &sf_g->map, path, fFlags);
    694694    if (RT_FAILURE(rc))
    695695    {
    696         LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Rrc\n", fDirectory,
    697                     path->String.utf8, rc));
     696        LogFunc(("(%d): VbglR0SfRemove(%s) failed rc=%Rrc\n", fDirectory, path->String.utf8, rc));
    698697        err = -RTErrConvertToErrno(rc);
    699698        goto fail1;
    … …  
    785784            int fDir = ((old_dentry->d_inode->i_mode & S_IFDIR) != 0);
    786785
    787             rc = vboxCallRename(&client_handle, &sf_g->map, old_path,
     786            rc = VbglR0SfRename(&client_handle, &sf_g->map, old_path,
    788787                                new_path, fDir ? 0 : SHFL_RENAME_FILE | SHFL_RENAME_REPLACE_IF_EXISTS);
    789788            if (RT_SUCCESS(rc))
    … …  
    797796            else
    798797            {
    799                 LogFunc(("vboxCallRename failed rc=%Rrc\n", rc));
     798                LogFunc(("VbglR0SfRename failed rc=%Rrc\n", rc));
    800799                err = -RTErrConvertToErrno(rc);
    801800                kfree(new_path);
    … …  
    840839    memcpy(ssymname->String.utf8, symname, symname_len);
    841840
    842     rc = vboxCallSymlink(&client_handle, &sf_g->map, path, ssymname, &info);
     841    rc = VbglR0SfSymlink(&client_handle, &sf_g->map, path, ssymname, &info);
    843842    kfree(ssymname);
    844843
    … …  
    850849            goto fail1;
    851850        }
    852         LogFunc(("vboxCallSymlink(%s) failed rc=%Rrc\n",
     851        LogFunc(("VbglR0SfSymlink(%s) failed rc=%Rrc\n",
    853852                    sf_i->path->String.utf8, rc));
    854853        err = -EPROTO;

  • trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c

    r57132 r58195  
    3737    {
    3838        error = 0;
    39         rc = vboxReadLink(&client_handle, &sf_g->map, sf_i->path, PATH_MAX, path);
     39        rc = VbglR0SfReadLink(&client_handle, &sf_g->map, sf_i->path, PATH_MAX, path);
    4040        if (RT_FAILURE(rc))
    4141        {
    42             LogFunc(("vboxReadLink failed, caller=%s, rc=%Rrc\n", __func__, rc));
     42            LogFunc(("VbglR0SfReadLink failed, caller=%s, rc=%Rrc\n", __func__, rc));
    4343            free_page((unsigned long)path);
    4444            error = -EPROTO;

  • trunk/src/VBox/Additions/linux/sharedfolders/regops.c

    r53757 r58195  
    6464     *        contiguous in physical memory (kmalloc or single page), we should
    6565     *        use a physical address here to speed things up. */
    66     int rc = vboxCallRead(&client_handle, &sf_g->map, sf_r->handle,
     66    int rc = VbglR0SfRead(&client_handle, &sf_g->map, sf_r->handle,
    6767                          pos, nread, buf, false /* already locked? */);
    6868    if (RT_FAILURE(rc))
    6969    {
    70         LogFunc(("vboxCallRead failed. caller=%s, rc=%Rrc\n", caller, rc));
     70        LogFunc(("VbglR0SfRead failed. caller=%s, rc=%Rrc\n", caller, rc));
    7171        return -EPROTO;
    7272    }
    … …  
    8181     *        contiguous in physical memory (kmalloc or single page), we should
    8282     *        use a physical address here to speed things up. */
    83     int rc = vboxCallWrite(&client_handle, &sf_g->map, sf_r->handle,
     83    int rc = VbglR0SfWrite(&client_handle, &sf_g->map, sf_r->handle,
    8484                           pos, nwritten, buf, false /* already locked? */);
    8585    if (RT_FAILURE(rc))
    8686    {
    87         LogFunc(("vboxCallWrite failed. caller=%s, rc=%Rrc\n",
     87        LogFunc(("VbglR0SfWrite failed. caller=%s, rc=%Rrc\n",
    8888                    caller, rc));
    8989        return -EPROTO;
    … …  
    374374
    375375    params.Info.Attr.fMode = inode->i_mode;
    376     LogFunc(("sf_reg_open: calling vboxCallCreate, file %s, flags=%#x, %#x\n",
     376    LogFunc(("sf_reg_open: calling VbglR0SfCreate, file %s, flags=%#x, %#x\n",
    377377              sf_i->path->String.utf8 , file->f_flags, params.CreateFlags));
    378     rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, &params);
     378    rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, &params);
    379379    if (RT_FAILURE(rc))
    380380    {
    381         LogFunc(("vboxCallCreate failed flags=%d,%#x rc=%Rrc\n",
     381        LogFunc(("VbglR0SfCreate failed flags=%d,%#x rc=%Rrc\n",
    382382                  file->f_flags, params.CreateFlags, rc));
    383383        kfree(sf_r);
    … …  
    439439        filemap_fdatawait(inode->i_mapping);
    440440#endif
    441     rc = vboxCallClose(&client_handle, &sf_g->map, sf_r->handle);
     441    rc = VbglR0SfClose(&client_handle, &sf_g->map, sf_r->handle);
    442442    if (RT_FAILURE(rc))
    443         LogFunc(("vboxCallClose failed rc=%Rrc\n", rc));
     443        LogFunc(("VbglR0SfClose failed rc=%Rrc\n", rc));
    444444
    445445    kfree(sf_r);
    … …  
    482482#endif
    483483
    484     /* Don't use GFP_HIGHUSER as long as sf_reg_read_aux() calls vboxCallRead()
     484    /* Don't use GFP_HIGHUSER as long as sf_reg_read_aux() calls VbglR0SfRead()
    485485     * which works on virtual addresses. On Linux cannot reliably determine the
    486486     * physical address for high memory, see rtR0MemObjNativeLockKernel(). */

  • trunk/src/VBox/Additions/linux/sharedfolders/utils.c

    r54391 r58195  
    183183    params.Handle = SHFL_HANDLE_NIL;
    184184    params.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
    185     LogFunc(("sf_stat: calling vboxCallCreate, file %s, flags %#x\n",
     185    LogFunc(("sf_stat: calling VbglR0SfCreate, file %s, flags %#x\n",
    186186             path->String.utf8, params.CreateFlags));
    187     rc = vboxCallCreate(&client_handle, &sf_g->map, path, &params);
     187    rc = VbglR0SfCreate(&client_handle, &sf_g->map, path, &params);
    188188    if (rc == VERR_INVALID_NAME)
    189189    {
    … …  
    193193    if (RT_FAILURE(rc))
    194194    {
    195         LogFunc(("vboxCallCreate(%s) failed.  caller=%s, rc=%Rrc\n",
     195        LogFunc(("VbglR0SfCreate(%s) failed.  caller=%s, rc=%Rrc\n",
    196196                    path->String.utf8, rc, caller));
    197197        return -EPROTO;
    … …  
    200200    {
    201201        if (!ok_to_fail)
    202             LogFunc(("vboxCallCreate(%s) file does not exist.  caller=%s, result=%d\n",
     202            LogFunc(("VbglR0SfCreate(%s) file does not exist.  caller=%s, result=%d\n",
    203203                        path->String.utf8, params.Result, caller));
    204204        return -ENOENT;
    … …  
    329329        params.CreateFlags |= SHFL_CF_ACCESS_WRITE;
    330330
    331     rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, &params);
     331    rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, &params);
    332332    if (RT_FAILURE(rc))
    333333    {
    334         LogFunc(("vboxCallCreate(%s) failed rc=%Rrc\n",
     334        LogFunc(("VbglR0SfCreate(%s) failed rc=%Rrc\n",
    335335                 sf_i->path->String.utf8, rc));
    336336        err = -RTErrConvertToErrno(rc);
    … …  
    379379
    380380        cbBuffer = sizeof(info);
    381         rc = vboxCallFSInfo(&client_handle, &sf_g->map, params.Handle,
    382                 SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer,
    383                 (PSHFLDIRINFO)&info);
     381        rc = VbglR0SfFsInfo(&client_handle, &sf_g->map, params.Handle,
     382                            SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer,
     383                            (PSHFLDIRINFO)&info);
    384384        if (RT_FAILURE(rc))
    385385        {
    386             LogFunc(("vboxCallFSInfo(%s, FILE) failed rc=%Rrc\n",
     386            LogFunc(("VbglR0SfFsInfo(%s, FILE) failed rc=%Rrc\n",
    387387                        sf_i->path->String.utf8, rc));
    388388            err = -RTErrConvertToErrno(rc);
    … …  
    396396        info.cbObject = iattr->ia_size;
    397397        cbBuffer = sizeof(info);
    398         rc = vboxCallFSInfo(&client_handle, &sf_g->map, params.Handle,
     398        rc = VbglR0SfFsInfo(&client_handle, &sf_g->map, params.Handle,
    399399                            SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuffer,
    400400                            (PSHFLDIRINFO)&info);
    401401        if (RT_FAILURE(rc))
    402402        {
    403             LogFunc(("vboxCallFSInfo(%s, SIZE) failed rc=%Rrc\n",
     403            LogFunc(("VbglR0SfFsInfo(%s, SIZE) failed rc=%Rrc\n",
    404404                        sf_i->path->String.utf8, rc));
    405405            err = -RTErrConvertToErrno(rc);
    … …  
    408408    }
    409409
    410     rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
     410    rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
    411411    if (RT_FAILURE(rc))
    412         LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
     412        LogFunc(("VbglR0SfClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
    413413
    414414    return sf_inode_revalidate(dentry);
    415415
    416416fail1:
    417     rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
     417    rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
    418418    if (RT_FAILURE(rc))
    419         LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
     419        LogFunc(("VbglR0SfClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
    420420
    421421fail2:
    … …  
    794794        cbSize = b->cbFree;
    795795
    796         rc = vboxCallDirInfo(&client_handle, &sf_g->map, handle, mask,
     796        rc = VbglR0SfDirInfo(&client_handle, &sf_g->map, handle, mask,
    797797                             0, 0, &cbSize, buf, &cEntries);
    798798        switch (rc)
    … …  
    808808            default:
    809809                err = -RTErrConvertToErrno(rc);
    810                 LogFunc(("vboxCallDirInfo failed rc=%Rrc\n", rc));
     810                LogFunc(("VbglR0SfDirInfo failed rc=%Rrc\n", rc));
    811811                goto fail1;
    812812        }
    … …  
    837837    sf_g = GET_GLOB_INFO(sb);
    838838    cbBuffer = sizeof(SHFLVolumeInfo);
    839     rc = vboxCallFSInfo(&client_handle, &sf_g->map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
     839    rc = VbglR0SfFsInfo(&client_handle, &sf_g->map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
    840840                        &cbBuffer, (PSHFLDIRINFO)&SHFLVolumeInfo);
    841841    if (RT_FAILURE(rc))

  • trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

    r48941 r58195  
    145145    }
    146146
    147     rc = vboxCallMapFolder(&client_handle, str_name, &sf_g->map);
     147    rc = VbglR0SfMapFolder(&client_handle, str_name, &sf_g->map);
    148148    kfree(str_name);
    149149
    … …  
    151151    {
    152152        err = -EPROTO;
    153         LogFunc(("vboxCallMapFolder failed rc=%d\n", rc));
     153        LogFunc(("VbglR0SfMapFolder failed rc=%d\n", rc));
    154154        goto fail2;
    155155    }
    … …  
    194194
    195195    TRACE();
    196     rc = vboxCallUnmapFolder(&client_handle, &sf_g->map);
     196    rc = VbglR0SfUnmapFolder(&client_handle, &sf_g->map);
    197197    if (RT_FAILURE(rc))
    198         LogFunc(("vboxCallUnmapFolder failed rc=%d\n", rc));
     198        LogFunc(("VbglR0SfUnmapFolder failed rc=%d\n", rc));
    199199
    200200    if (sf_g->nls)
    … …  
    595595    }
    596596
    597     rcVBox = vboxInit();
     597    rcVBox = VbglR0SfInit();
    598598    if (RT_FAILURE(rcVBox))
    599599    {
    600         LogRelFunc(("vboxInit failed, rc=%d\n", rcVBox));
     600        LogRelFunc(("VbglR0SfInit failed, rc=%d\n", rcVBox));
    601601        rcRet = -EPROTO;
    602602        goto fail0;
    603603    }
    604604
    605     rcVBox = vboxConnect(&client_handle);
     605    rcVBox = VbglR0SfConnect(&client_handle);
    606606    if (RT_FAILURE(rcVBox))
    607607    {
    608         LogRelFunc(("vboxConnect failed, rc=%d\n", rcVBox));
     608        LogRelFunc(("VbglR0SfConnect failed, rc=%d\n", rcVBox));
    609609        rcRet = -EPROTO;
    610610        goto fail1;
    611611    }
    612612
    613     rcVBox = vboxCallSetUtf8(&client_handle);
     613    rcVBox = VbglR0SfSetUtf8(&client_handle);
    614614    if (RT_FAILURE(rcVBox))
    615615    {
    616         LogRelFunc(("vboxCallSetUtf8 failed, rc=%d\n", rcVBox));
     616        LogRelFunc(("VbglR0SfSetUtf8 failed, rc=%d\n", rcVBox));
    617617        rcRet = -EPROTO;
    618618        goto fail2;
    … …  
    622622    if (!follow_symlinks)
    623623    {
    624         rcVBox = vboxCallSetSymlinks(&client_handle);
     624        rcVBox = VbglR0SfSetSymlinks(&client_handle);
    625625        if (RT_FAILURE(rcVBox))
    626626        {
    … …  
    639639
    640640fail2:
    641     vboxDisconnect(&client_handle);
     641    VbglR0SfDisconnect(&client_handle);
    642642
    643643fail1:
    644     vboxUninit();
     644    VbglR0SfTerm();
    645645
    646646fail0:
    … …  
    653653    TRACE();
    654654
    655     vboxDisconnect(&client_handle);
    656     vboxUninit();
     655    VbglR0SfDisconnect(&client_handle);
     656    VbglR0SfTerm();
    657657    unregister_filesystem(&vboxsf_fs_type);
    658658}
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