Changeset 58195 in vbox

Timestamp:

Oct 12, 2015 3:13:47 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103309

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

Files:

• WINNT/SharedFolders/driver/file.c (modified) (7 diffs)
• WINNT/SharedFolders/driver/info.c (modified) (5 diffs)
• WINNT/SharedFolders/driver/net.c (modified) (2 diffs)
• WINNT/SharedFolders/driver/path.c (modified) (8 diffs)
• WINNT/SharedFolders/driver/vbsf.c (modified) (6 diffs)
• common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c (modified) (40 diffs)
• common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h (modified) (2 diffs)
• darwin/vboxfs/VBoxVFS-VFSOps.cpp (modified) (5 diffs)
• darwin/vboxfs/VBoxVFS-VNODEOps.cpp (modified) (4 diffs)
• darwin/vboxfs/VBoxVFS-utils.cpp (modified) (3 diffs)
• darwin/vboxfs/VBoxVFS.cpp (modified) (6 diffs)
• freebsd/vboxvfs/vboxvfs_vfsops.c (modified) (5 diffs)
• haiku/SharedFolders/vboxsf.c (modified) (26 diffs)
• linux/sharedfolders/dirops.c (modified) (13 diffs)
• linux/sharedfolders/lnkops.c (modified) (1 diff)
• linux/sharedfolders/regops.c (modified) (5 diffs)
• linux/sharedfolders/utils.c (modified) (10 diffs)
• linux/sharedfolders/vfsmod.c (modified) (7 diffs)
• solaris/SharedFolders/vboxfs_prov.c (modified) (30 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.c

@@ -43 +43 @@
                                   uint8_t *pBuffer, bool fLocked)
 {
-    return vboxCallRead(pClient, pMap, hFile, offset, pcbBuffer, pBuffer, fLocked);
+    return VbglR0SfRead(pClient, pMap, hFile, offset, pcbBuffer, pBuffer, fLocked);
 }
 
@@ -50 +50 @@
                                    uint8_t *pBuffer, bool fLocked)
 {
-    return vboxCallWrite(pClient, pMap, hFile, offset, pcbBuffer, pBuffer, fLocked);
+    return VbglR0SfWrite(pClient, pMap, hFile, offset, pcbBuffer, pBuffer, fLocked);
 }
 
@@ -57 +57 @@
                                  uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages)
 {
-    return VbglR0SharedFolderReadPageList(pClient, pMap, hFile, offset, pcbBuffer, offFirstPage, cPages, paPages);
+    return VbglR0SfReadPageList(pClient, pMap, hFile, offset, pcbBuffer, offFirstPage, cPages, paPages);
 }
 
@@ -64 +64 @@
                                   uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages)
 {
-    return VbglR0SharedFolderWritePageList(pClient, pMap, hFile, offset, pcbBuffer, offFirstPage, cPages, paPages);
+    return VbglR0SfWritePageList(pClient, pMap, hFile, offset, pcbBuffer, offFirstPage, cPages, paPages);
 }
 
@@ -491 +491 @@
         fu32Lock |= SHFL_LOCK_WAIT;
 
-    vboxRC = vboxCallLock(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+    vboxRC = VbglR0SfLock(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
                           LowIoContext->ParamsFor.Locks.ByteOffset, LowIoContext->ParamsFor.Locks.Length, fu32Lock);
 
@@ -524 +524 @@
 
     /* Do the actual flushing of file buffers */
-    vboxRC = vboxCallFlush(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile);
+    vboxRC = VbglR0SfFlush(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile);
 
     Status = VBoxErrorToNTStatus(vboxRC);
@@ -565 +565 @@
     pObjInfo->cbObject = pNewFileSize->QuadPart;
 
-    vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+    vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
                             SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuffer, (PSHFLDIRINFO)pObjInfo);
 
-    Log(("VBOXSF: vbsfSetEndOfFile: vboxCallFSInfo returned %Rrc\n", vboxRC));
+    Log(("VBOXSF: vbsfSetEndOfFile: VbglR0SfFsInfo returned %Rrc\n", vboxRC));
 
     Status = VBoxErrorToNTStatus(vboxRC);
     if (Status == STATUS_SUCCESS)
     {
-        Log(("VBOXSF: vbsfSetEndOfFile: vboxCallFSInfo new allocation size = %RX64\n",
+        Log(("VBOXSF: vbsfSetEndOfFile: VbglR0SfFsInfo new allocation size = %RX64\n",
              pObjInfo->cbAllocated));
 

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.c

@@ -165 +165 @@
     cFiles = 0;
 
-    /* vboxCallDirInfo requires a pointer to uint32_t. */
+    /* VbglR0SfDirInfo requires a pointer to uint32_t. */
     u32BufSize = cbHGCMBuffer;
 
     Log(("VBOXSF: MrxQueryDirectory: CallDirInfo: File = 0x%08x, Flags = 0x%08x, Index = %d, u32BufSize = %d\n",
          pVBoxFobx->hFile, fSFFlags, index, u32BufSize));
-    vboxRC = vboxCallDirInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+    vboxRC = VbglR0SfDirInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
                              ParsedPath, fSFFlags, index, &u32BufSize, (PSHFLDIRINFO)pHGCMBuffer, &cFiles);
     Log(("VBOXSF: MrxQueryDirectory: u32BufSize after CallDirInfo = %d, rc = %Rrc\n",
@@ -592 +592 @@
             }
 
-            vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+            vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
                                     SHFL_INFO_GET | SHFL_INFO_VOLUME, &cbHGCMBuffer, (PSHFLDIRINFO)pHGCMBuffer);
 
@@ -765 +765 @@
             }
 
-            vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+            vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
                                     SHFL_INFO_GET | SHFL_INFO_VOLUME, &cbHGCMBuffer, (PSHFLDIRINFO)pHGCMBuffer);
 
@@ -1098 +1098 @@
 
         Assert(pVBoxFobx && pNetRootExtension && pDeviceExtension);
-        vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+        vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
                                 SHFL_INFO_GET | SHFL_INFO_FILE, &cbHGCMBuffer, (PSHFLDIRINFO)pHGCMBuffer);
 
@@ -1429 +1429 @@
 
             Assert(pVBoxFobx && pNetRootExtension && pDeviceExtension);
-            vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+            vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
                                     SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer, (PSHFLDIRINFO)pSHFLFileInfo);
 

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/net.c

@@ -206 +206 @@
             }
 
-            vboxRC = vboxCallMapFolder(&pDeviceExtension->hgcmClient, ParsedPath, &pNetRootExtension->map);
+            vboxRC = VbglR0SfMapFolder(&pDeviceExtension->hgcmClient, ParsedPath, &pNetRootExtension->map);
             vbsfFreeNonPagedMem(ParsedPath);
             if (vboxRC != VINF_SUCCESS)
             {
-                Log(("VBOXSF: MRxCreateVNetRoot: vboxCallMapFolder failed with %d\n", vboxRC));
+                Log(("VBOXSF: MRxCreateVNetRoot: VbglR0SfMapFolder failed with %d\n", vboxRC));
                 Status = STATUS_BAD_NETWORK_NAME;
             }
@@ -264 +264 @@
     if (pNetRootExtension->phgcmClient)
     {
-        int vboxRC = vboxCallUnmapFolder(pNetRootExtension->phgcmClient, &pNetRootExtension->map);
+        int vboxRC = VbglR0SfUnmapFolder(pNetRootExtension->phgcmClient, &pNetRootExtension->map);
         if (vboxRC != VINF_SUCCESS)
-            Log(("VBOXSF: MRxFinalizeVNetRoot: vboxCallUnmapFolder failed with %d\n",
+            Log(("VBOXSF: MRxFinalizeVNetRoot: VbglR0SfUnmapFolder failed with %d\n",
                  vboxRC));
         pNetRootExtension->phgcmClient = NULL;

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.c

@@ -261 +261 @@
 
         /* Call host. */
-        Log(("VBOXSF: vbsfProcessCreate: vboxCallCreate called.\n"));
-        vboxRC = vboxCallCreate(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, ParsedPath, pCreateParms);
+        Log(("VBOXSF: vbsfProcessCreate: VbglR0SfCreate called.\n"));
+        vboxRC = VbglR0SfCreate(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, ParsedPath, pCreateParms);
 
         vbsfFreeNonPagedMem(ParsedPath);
     }
 
-    Log(("VBOXSF: vbsfProcessCreate: vboxCallCreate returns vboxRC = %Rrc, Result = 0x%x\n",
+    Log(("VBOXSF: vbsfProcessCreate: VbglR0SfCreate returns vboxRC = %Rrc, Result = 0x%x\n",
          vboxRC, pCreateParms->Result));
 
@@ -447 +447 @@
     if (pCreateParms && pCreateParms->Handle != SHFL_HANDLE_NIL)
     {
-        vboxCallClose(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pCreateParms->Handle);
+        VbglR0SfClose(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pCreateParms->Handle);
         *pHandle = SHFL_HANDLE_NIL;
     }
@@ -699 +699 @@
         pSHFLFileInfo->Attr.fMode = NTToVBoxFileAttributes(pInfo->FileAttributes);
 
-    vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
+    vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
                             SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer, (PSHFLDIRINFO)pSHFLFileInfo);
 
@@ -745 +745 @@
     }
 
-    vboxRC = vboxCallClose(&pDeviceExtension->hgcmClient,
+    vboxRC = VbglR0SfClose(&pDeviceExtension->hgcmClient,
                            &pNetRootExtension->map,
                            pVBoxFobx->hFile);
@@ -839 +839 @@
 
     /* Call host. */
-    vboxRC = vboxCallRemove(&pDeviceExtension->hgcmClient, &pNetRootExtension->map,
+    vboxRC = VbglR0SfRemove(&pDeviceExtension->hgcmClient, &pNetRootExtension->map,
                             ParsedPath,
                             (pVBoxFobx->FileStandardInfo.Directory) ? SHFL_REMOVE_DIR : SHFL_REMOVE_FILE);
@@ -851 +851 @@
     Status = VBoxErrorToNTStatus(vboxRC);
     if (vboxRC != VINF_SUCCESS)
-        Log(("VBOXSF: vbsfRemove: vboxCallRemove failed with %Rrc\n", vboxRC));
+        Log(("VBOXSF: vbsfRemove: VbglR0SfRemove failed with %Rrc\n", vboxRC));
 
     Log(("VBOXSF: vbsfRemove: Returned 0x%08X\n", Status));
@@ -915 +915 @@
         flags |= SHFL_RENAME_REPLACE_IF_EXISTS;
 
-    Log(("VBOXSF: vbsfRename: Calling vboxCallRename\n"));
-    vboxRC = vboxCallRename(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, SrcPath, DestPath, flags);
+    Log(("VBOXSF: vbsfRename: Calling VbglR0SfRename\n"));
+    vboxRC = VbglR0SfRename(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, SrcPath, DestPath, flags);
 
     vbsfFreeNonPagedMem(SrcPath);
@@ -923 +923 @@
     Status = VBoxErrorToNTStatus(vboxRC);
     if (vboxRC != VINF_SUCCESS)
-        Log(("VBOXSF: vbsfRename: vboxCallRename failed with %Rrc\n", vboxRC));
+        Log(("VBOXSF: vbsfRename: VbglR0SfRename failed with %Rrc\n", vboxRC));
 
     Log(("VBOXSF: vbsfRename: Returned 0x%08X\n", Status));

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c

@@ -82 +82 @@
         PMRX_VBOX_DEVICE_EXTENSION pDeviceExtension;
         pDeviceExtension = (PMRX_VBOX_DEVICE_EXTENSION)((PBYTE)VBoxMRxDeviceObject + sizeof(RDBSS_DEVICE_OBJECT));
-        vboxDisconnect (&pDeviceExtension->hgcmClient);
-    }
-
-    vboxUninit();
+        VbglR0SfDisconnect(&pDeviceExtension->hgcmClient);
+    }
+
+    VbglR0SfTerm();
 
     if (VBoxMRxDeviceObject)
@@ -422 +422 @@
 
     /* Initialize VBox subsystem. */
-    vboxRC = vboxInit();
+    vboxRC = VbglR0SfInit();
     if (RT_FAILURE(vboxRC))
     {
@@ -431 +431 @@
     /* Connect the HGCM client */
     RT_ZERO(hgcmClient);
-    vboxRC = vboxConnect(&hgcmClient);
+    vboxRC = VbglR0SfConnect(&hgcmClient);
     if (RT_FAILURE(vboxRC))
     {
         Log(("VBOXSF: DriverEntry: ERROR while connecting to host (%Rrc)!\n",
              vboxRC));
-        vboxUninit();
+        VbglR0SfTerm();
         return STATUS_UNSUCCESSFUL;
     }
@@ -555 +555 @@
     Log(("VBOXSF: DriverEntry: Failure! Status = 0x%08X\n", Status));
 
-    vboxDisconnect(&hgcmClient);
-    vboxUninit();
+    VbglR0SfDisconnect(&hgcmClient);
+    VbglR0SfTerm();
 
     if (VBoxMRxDeviceObject)
@@ -711 +711 @@
                         uint32_t cMappings = RT_ELEMENTS(mappings);
 
-                        int vboxRC = vboxCallQueryMappings(&pDeviceExtension->hgcmClient, mappings, &cMappings);
+                        int vboxRC = VbglR0SfQueryMappings(&pDeviceExtension->hgcmClient, mappings, &cMappings);
 
                         if (vboxRC == VINF_SUCCESS)
@@ -838 +838 @@
                         break;
 
-                    vboxRC = vboxCallQueryMapName(&pDeviceExtension->hgcmClient,
+                    vboxRC = VbglR0SfQueryMapName(&pDeviceExtension->hgcmClient,
                                                   (*pConnectId) & ~0x80 /** @todo fix properly */,
                                                   pString, ShflStringSizeOfBuffer(pString));

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c

@@ -60 +60 @@
 
 
-DECLVBGL(int) vboxInit(void)
+DECLVBGL(int) VbglR0SfInit(void)
 {
     return VbglInitClient();
 }
 
-DECLVBGL(void) vboxUninit(void)
+DECLVBGL(void) VbglR0SfTerm(void)
 {
     VbglTerminate();
 }
 
-DECLVBGL(int) vboxConnect(PVBSFCLIENT pClient)
+DECLVBGL(int) VbglR0SfConnect(PVBSFCLIENT pClient)
 {
     int rc;
@@ -83 +83 @@
 
     rc = VbglHGCMConnect(&pClient->handle, &data);
-/*    Log(("VBOXSF: VBoxSF::vboxConnect: VbglHGCMConnect rc = %#x, result = %#x\n",
-         rc, data.result)); */
+/*    Log(("VBOXSF: VbglR0SfConnect: VbglHGCMConnect rc = %#x, result = %#x\n", rc, data.result)); */
     if (RT_SUCCESS(rc))
         rc = data.result;
@@ -95 +94 @@
 }
 
-DECLVBGL(void) vboxDisconnect(PVBSFCLIENT pClient)
+DECLVBGL(void) VbglR0SfDisconnect(PVBSFCLIENT pClient)
 {
     int rc;
@@ -110 +109 @@
     rc = VbglHGCMDisconnect(pClient->handle, &data);
     NOREF(rc);
-/*    Log(("VBOXSF: VBoxSF::vboxDisconnect: "
-         "VbglHGCMDisconnect rc = %#x, result = %#x\n", rc, data.result)); */
+/*    Log(("VBOXSF: VbglR0SfDisconnect: VbglHGCMDisconnect rc = %#x, result = %#x\n", rc, data.result)); */
     return;
 }
 
-DECLVBGL(int) vboxCallQueryMappings(PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings)
+DECLVBGL(int) VbglR0SfQueryMappings(PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings)
 {
     int rc;
@@ -132 +130 @@
     data.mappings.u.Pointer.u.linearAddr = (uintptr_t)&paMappings[0];
 
-/*    Log(("VBOXSF: in ifs difference %d\n",
-         (char *)&data.flags.type - (char *)&data.callInfo.cParms)); */
-    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallQueryMappings: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: in ifs difference %d\n", (char *)&data.flags.type - (char *)&data.callInfo.cParms)); */
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
+/*    Log(("VBOXSF: VbglR0SfQueryMappings: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
         rc = data.callInfo.result;
@@ -145 +141 @@
 }
 
-DECLVBGL(int) vboxCallQueryMapName(PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size)
+DECLVBGL(int) VbglR0SfQueryMapName(PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size)
 {
     int rc;
@@ -160 +156 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallQueryMapName: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
-    if (RT_SUCCESS(rc))
-        rc = data.callInfo.result;
-
-    return rc;
-}
-
-DECLVBGL(int) vboxCallMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap)
+/*    Log(("VBOXSF: VbglR0SfQueryMapName: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+
+    return rc;
+}
+
+DECLVBGL(int) VbglR0SfMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap)
 {
     int rc;
@@ -193 +188 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallMapFolder: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfMapFolder: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
     {
@@ -227 +221 @@
 }
 
-DECLVBGL(int) vboxCallUnmapFolder(PVBSFCLIENT pClient, PVBSFMAP pMap)
+DECLVBGL(int) VbglR0SfUnmapFolder(PVBSFCLIENT pClient, PVBSFMAP pMap)
 {
     int rc;
@@ -238 +232 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallUnmapFolder: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
-    if (RT_SUCCESS(rc))
-        rc = data.callInfo.result;
-    return rc;
-}
-
-DECLVBGL(int) vboxCallCreate(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms)
+/*    Log(("VBOXSF: VbglR0SfUnmapFolder: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) VbglR0SfCreate(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms)
 {
     /** @todo copy buffers to physical or mapped memory. */
@@ -265 +258 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallCreate: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
-    if (RT_SUCCESS(rc))
-        rc = data.callInfo.result;
-    return rc;
-}
-
-DECLVBGL(int) vboxCallClose(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle)
+/*    Log(("VBOXSF: VbglR0SfCreate: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) VbglR0SfClose(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle)
 {
     int rc;
@@ -286 +278 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallClose: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
-    if (RT_SUCCESS(rc))
-        rc = data.callInfo.result;
-    return rc;
-}
-
-DECLVBGL(int) vboxCallRemove (PVBSFCLIENT pClient, PVBSFMAP pMap,
-                              PSHFLSTRING pParsedPath, uint32_t flags)
+/*    Log(("VBOXSF: VbglR0SfClose: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) VbglR0SfRemove(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags)
 {
     int rc = VINF_SUCCESS;
@@ -313 +303 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallRemove: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfRemove: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
         rc = data.callInfo.result;
@@ -320 +309 @@
 }
 
-DECLVBGL(int) vboxCallRename(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags)
+DECLVBGL(int) VbglR0SfRename(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags)
 {
     int rc;
@@ -342 +331 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallRename: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfRename: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
         rc = data.callInfo.result;
@@ -349 +337 @@
 }
 
-DECLVBGL(int) vboxCallRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
+DECLVBGL(int) VbglR0SfRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
                            uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked)
 {
@@ -371 +359 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallRead: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfRead: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
     {
@@ -381 +368 @@
 }
 
-DECLVBGL(int) VbglR0SharedFolderReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                                             uint64_t offset, uint32_t *pcbBuffer,
-                                             uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages)
+DECLVBGL(int) VbglR0SfReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer,
+                                   uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages)
 {
     uint32_t            cbToRead  = *pcbBuffer;
@@ -417 +403 @@
 
     rc = VbglHGCMCall(pClient->handle, &pData->callInfo, cbData);
-    if (RT_SUCCESS (rc))
+/*    Log(("VBOXSF: VbglR0SfReadPageList: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
     {
         rc = pData->callInfo.result;
@@ -427 +414 @@
 }
 
-DECLVBGL(int) vboxCallWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
+DECLVBGL(int) VbglR0SfWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
                             uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked)
 {
@@ -449 +436 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallWrite: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfWrite: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
     {
@@ -459 +445 @@
 }
 
-DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer)
+DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset,
+                                    uint32_t *pcbBuffer, RTCCPHYS PhysBuffer)
 {
     uint32_t            cbToWrite = *pcbBuffer;
@@ -495 +482 @@
 
     rc = VbglHGCMCall(pClient->handle, &pData->callInfo, cbData);
+/*    Log(("VBOXSF: VbglR0SfWritePhysCont: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
     {
@@ -506 +494 @@
 }
 
-DECLVBGL(int) VbglR0SharedFolderWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                                              uint64_t offset, uint32_t *pcbBuffer,
-                                              uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages)
+DECLVBGL(int) VbglR0SfWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer,
+                                    uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages)
 {
     uint32_t            cbToWrite = *pcbBuffer;
@@ -542 +529 @@
 
     rc = VbglHGCMCall(pClient->handle, &pData->callInfo, cbData);
+/*    Log(("VBOXSF: VbglR0SfWritePageList: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
     {
@@ -552 +540 @@
 }
 
-DECLVBGL(int) vboxCallFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile)
+DECLVBGL(int) VbglR0SfFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile)
 {
     int rc;
@@ -566 +554 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallFlush: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
-    if (RT_SUCCESS(rc))
-        rc = data.callInfo.result;
-    return rc;
-}
-
-DECLVBGL(int) vboxCallDirInfo(
+/*    Log(("VBOXSF: VbglR0SfFlush: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) VbglR0SfDirInfo(
     PVBSFCLIENT pClient,
     PVBSFMAP pMap,
@@ -612 +599 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallDirInfo: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfDirInfo: rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
         rc = data.callInfo.result;
@@ -621 +607 @@
 }
 
-DECLVBGL(int) vboxCallFSInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
+DECLVBGL(int) VbglR0SfFsInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
                              uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer)
 {
@@ -643 +629 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallFileInfo: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfFsInfo: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
     {
@@ -653 +638 @@
 }
 
-DECLVBGL(int) vboxCallLock(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
+DECLVBGL(int) VbglR0SfLock(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
                            uint64_t offset, uint64_t cbSize, uint32_t fLock)
 {
@@ -675 +660 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallLock: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfLock: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
         rc = data.callInfo.result;
@@ -682 +666 @@
 }
 
-DECLVBGL(int) vboxCallSetUtf8(PVBSFCLIENT pClient)
+DECLVBGL(int) VbglR0SfSetUtf8(PVBSFCLIENT pClient)
 {
     int rc;
@@ -689 +673 @@
     VBOX_INIT_CALL(&callInfo, SET_UTF8, pClient);
     rc = VbglHGCMCall(pClient->handle, &callInfo, sizeof(callInfo));
+/*    Log(("VBOXSF: VbglR0SfSetUtf8: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
         rc = callInfo.result;
@@ -694 +679 @@
 }
 
-DECLVBGL(int) vboxReadLink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t cbBuffer, uint8_t *pBuffer)
+DECLVBGL(int) VbglR0SfReadLink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t cbBuffer, uint8_t *pBuffer)
 {
     int rc;
@@ -713 +698 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallReadline: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfReadLink: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
         rc = data.callInfo.result;
@@ -720 +704 @@
 }
 
-DECLVBGL(int) vboxCallSymlink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath,
+DECLVBGL(int) VbglR0SfSymlink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath,
                               PSHFLFSOBJINFO pBuffer)
 {
@@ -744 +728 @@
 
     rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
-/*    Log(("VBOXSF: VBoxSF::vboxCallSymlink: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+/*    Log(("VBOXSF: VbglR0SfSymlink: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
         rc = data.callInfo.result;
@@ -751 +734 @@
 }
 
-DECLVBGL(int) vboxCallSetSymlinks(PVBSFCLIENT pClient)
+DECLVBGL(int) VbglR0SfSetSymlinks(PVBSFCLIENT pClient)
 {
     int rc;
@@ -758 +741 @@
     VBOX_INIT_CALL(&callInfo, SET_SYMLINKS, pClient);
     rc = VbglHGCMCall(pClient->handle, &callInfo, sizeof(callInfo));
+/*    Log(("VBOXSF: VbglR0SfSetSymlinks: VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS(rc))
         rc = callInfo.result;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h

@@ -129 +129 @@
 #endif
 
-DECLVBGL(int)  vboxInit(void);
-DECLVBGL(void) vboxUninit(void);
-DECLVBGL(int)  vboxConnect(PVBSFCLIENT pClient);
-DECLVBGL(void) vboxDisconnect(PVBSFCLIENT pClient);
+DECLVBGL(int)  VbglR0SfInit(void);
+DECLVBGL(void) VbglR0SfTerm(void);
+DECLVBGL(int)  VbglR0SfConnect(PVBSFCLIENT pClient);
+DECLVBGL(void) VbglR0SfDisconnect(PVBSFCLIENT pClient);
 
-DECLVBGL(int) vboxCallQueryMappings(PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings);
+DECLVBGL(int)  VbglR0SfQueryMappings(PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings);
 
-DECLVBGL(int) vboxCallQueryMapName(PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size);
+DECLVBGL(int)  VbglR0SfQueryMapName(PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size);
 
 /**
@@ -161 +161 @@
  *       as additional information.
  */
-DECLVBGL(int) vboxCallCreate(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms);
+DECLVBGL(int)  VbglR0SfCreate(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms);
 
-DECLVBGL(int) vboxCallClose(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle);
-DECLVBGL(int) vboxCallRemove(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags);
-DECLVBGL(int) vboxCallRename(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags);
-DECLVBGL(int) vboxCallFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile);
+DECLVBGL(int)  VbglR0SfClose(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle);
+DECLVBGL(int)  VbglR0SfRemove(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags);
+DECLVBGL(int)  VbglR0SfRename(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags);
+DECLVBGL(int)  VbglR0SfFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile);
 
-DECLVBGL(int) vboxCallRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
-DECLVBGL(int) VbglR0SharedFolderReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                                             uint64_t offset, uint32_t *pcbBuffer,
-                                             uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages);
-DECLVBGL(int) vboxCallWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
-DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer);
-DECLVBGL(int) VbglR0SharedFolderWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
-                                              uint64_t offset, uint32_t *pcbBuffer,
-                                              uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages);
+DECLVBGL(int)  VbglR0SfRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
+DECLVBGL(int)  VbglR0SfReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer,
+                                    uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages);
+DECLVBGL(int)  VbglR0SfWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset,
+                             uint32_t *pcbBuffer,  uint8_t *pBuffer, bool fLocked);
+DECLVBGL(int)  VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset,
+                                     uint32_t *pcbBuffer, RTCCPHYS PhysBuffer);
+DECLVBGL(int)  VbglR0SfWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer,
+                                     uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages);
 
-DECLVBGL(int) vboxCallLock(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock);
+DECLVBGL(int)  VbglR0SfLock(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock);
 
-DECLVBGL(int) vboxCallDirInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,PSHFLSTRING ParsedPath, uint32_t flags,
-                              uint32_t index, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer, uint32_t *pcFiles);
-DECLVBGL(int) vboxCallFSInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer);
+DECLVBGL(int)  VbglR0SfDirInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,PSHFLSTRING ParsedPath, uint32_t flags,
+                                 uint32_t index, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer, uint32_t *pcFiles);
+DECLVBGL(int)  VbglR0SfFsInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer);
 
-DECLVBGL(int) vboxCallMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap);
-DECLVBGL(int) vboxCallUnmapFolder(PVBSFCLIENT pClient, PVBSFMAP pMap);
-DECLVBGL(int) vboxCallSetUtf8(PVBSFCLIENT pClient);
+DECLVBGL(int)  VbglR0SfMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap);
+DECLVBGL(int)  VbglR0SfUnmapFolder(PVBSFCLIENT pClient, PVBSFMAP pMap);
+DECLVBGL(int)  VbglR0SfSetUtf8(PVBSFCLIENT pClient);
 
-DECLVBGL(int) vboxReadLink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING ParsedPath, uint32_t pcbBuffer, uint8_t *pBuffer);
-DECLVBGL(int) vboxCallSymlink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer);
-DECLVBGL(int) vboxCallSetSymlinks(PVBSFCLIENT pClient);
+DECLVBGL(int)  VbglR0SfReadLink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING ParsedPath, uint32_t pcbBuffer, uint8_t *pBuffer);
+DECLVBGL(int)  VbglR0SfSymlink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer);
+DECLVBGL(int)  VbglR0SfSetSymlinks(PVBSFCLIENT pClient);
 
 #endif /* !___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h */

trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS-VFSOps.cpp

@@ -286 +286 @@
     if (pMount)
     {
-        rc = vboxCallMapFolder(&g_vboxSFClient, pMount->pShareName, &pMount->pMap);
+        rc = VbglR0SfMapFolder(&g_vboxSFClient, pMount->pShareName, &pMount->pMap);
         if (RT_SUCCESS(rc))
         {
@@ -302 +302 @@
             return 0;
         }
-        else
-            PDEBUG("Unable to map shared folder");
-
+
+        PDEBUG("Unable to map shared folder");
         vboxvfs_destroy_internal_data(&pMount);
     }
@@ -354 +353 @@
                 vfs_setfsprivate(mp, NULL);
 
-                rc = vboxCallUnmapFolder(&g_vboxSFClient, &pMount->pMap);
+                rc = VbglR0SfUnmapFolder(&g_vboxSFClient, &pMount->pMap);
                 if (RT_SUCCESS(rc))
                 {
@@ -361 +360 @@
                     return 0;
                 }
-                else
-                {
-                     PDEBUG("Unable to unmount shared folder");
-                     rc = EPROTO;
-                }
+
+                PDEBUG("Unable to unmount shared folder");
+                rc = EPROTO;
             }
             else
@@ -518 +515 @@
     AssertReturn(pMount->pShareName, EINVAL);
 
-    rc = vboxCallFSInfo(&g_vboxSFClient, &pMount->pMap, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
-                            &cbBuffer, (PSHFLDIRINFO)&SHFLVolumeInfo);
+    rc = VbglR0SfFsInfo(&g_vboxSFClient, &pMount->pMap, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
+                        &cbBuffer, (PSHFLDIRINFO)&SHFLVolumeInfo);
     AssertReturn(rc == 0, EPROTO);
 

trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS-VNODEOps.cpp

@@ -556 +556 @@
     PDEBUG("Exploring VBoxVFS directory (%s), handle (0x%.8X), offset (0x%X), count (%d)", (char *)pVnodeData->pPath->String.utf8, (int)pVnodeData->pHandle, index, uio_iovcnt(uio));
 
-    /* Currently, there is a problem when vboxCallDirInfo() is not able to
+    /* Currently, there is a problem when VbglR0SfDirInfo() is not able to
      * continue retrieve directory content if the same VBoxVFS handle is used.
      * This macro forces to use a new handle in readdir() callback. If enabled,
@@ -575 +575 @@
 
 #if 0
-    rc = vboxCallDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0, 0, index, &cbInfo, (PSHFLDIRINFO)Info, &cFiles);
+    rc = VbglR0SfDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0, 0, index, &cbInfo, (PSHFLDIRINFO)Info, &cFiles);
 #else
     SHFLSTRING *pMask = vboxvfs_construct_shflstring("*", strlen("*"));
@@ -582 +582 @@
         for (uint32_t cSkip = 0; (cSkip < index + 1) && (rc == VINF_SUCCESS); cSkip++)
         {
-            //rc = vboxCallDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0 /* pMask */, 0 /* SHFL_LIST_RETURN_ONE */, 0, &cbInfo, (PSHFLDIRINFO)Info, &cFiles);
+            //rc = VbglR0SfDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0 /* pMask */, 0 /* SHFL_LIST_RETURN_ONE */, 0, &cbInfo, (PSHFLDIRINFO)Info, &cFiles);
 
             uint32_t cbReturned = cbInfo;
-            //rc = vboxCallDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, pMask, SHFL_LIST_RETURN_ONE, 0, &cbReturned, (PSHFLDIRINFO)Info, &cFiles);
-            rc = vboxCallDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0, SHFL_LIST_RETURN_ONE, 0, &cbReturned, (PSHFLDIRINFO)Info, &cFiles);
+            //rc = VbglR0SfDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, pMask, SHFL_LIST_RETURN_ONE, 0, &cbReturned, (PSHFLDIRINFO)Info, &cFiles);
+            rc = VbglR0SfDirInfo(&g_vboxSFClient, &pMount->pMap, Handle, 0, SHFL_LIST_RETURN_ONE, 0,
+                                 &cbReturned, (PSHFLDIRINFO)Info, &cFiles);
 
         }
@@ -624 +625 @@
         default:
         {
-            PDEBUG("vboxCallDirInfo() for item #%d has failed: %d", (int)index, (int)rc);
+            PDEBUG("VbglR0SfDirInfo() for item #%d has failed: %d", (int)index, (int)rc);
             rc = EINVAL;
             break;

trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS-utils.cpp

@@ -400 +400 @@
     parms.CreateFlags   = fFlags;
 
-    rc = vboxCallCreate(&g_vboxSFClient, &pMount->pMap, pPath, &parms);
+    rc = VbglR0SfCreate(&g_vboxSFClient, &pMount->pMap, pPath, &parms);
     if (RT_SUCCESS(rc))
     {
@@ -425 +425 @@
 {
     AssertReturn(pMount, EINVAL);
-    return vboxCallClose(&g_vboxSFClient, &pMount->pMap, pHandle);
+    return VbglR0SfClose(&g_vboxSFClient, &pMount->pMap, pHandle);
 }
 
@@ -455 +455 @@
     parms.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
 
-    rc = vboxCallCreate(&g_vboxSFClient, &pMount->pMap, pSHFLDPath, &parms);
+    rc = VbglR0SfCreate(&g_vboxSFClient, &pMount->pMap, pSHFLDPath, &parms);
     if (rc == 0)
-    {
         *Info = parms.Info;
-    }
 
     return rc;

trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS.cpp

@@ -105 +105 @@
     /* Initialize the R0 guest library. */
 #if 0
-    rc = vboxInit();
+    rc = VbglR0SfInit();
     if (RT_FAILURE(rc))
         return KERN_FAILURE;
@@ -125 +125 @@
 
 #if 0
-    vboxUninit();
+   VbglR0SfTerminate();
 #endif
 
-    PINFO("VirtualBox " VBOX_VERSION_STRING " shared folders "
-          "driver is unloaded");
+    PINFO("VirtualBox " VBOX_VERSION_STRING " shared folders driver is unloaded");
 
     return KERN_SUCCESS;
@@ -220 +219 @@
     if (coreService)
     {
-        rc = vboxInit();
+        rc = VbglR0SfInit();
         if (RT_SUCCESS(rc))
         {
             /* Connect to the host service. */
-            rc = vboxConnect(&g_vboxSFClient);
+            rc = VbglR0SfConnect(&g_vboxSFClient);
             if (RT_SUCCESS(rc))
             {
                 PINFO("VBox client connected");
-                rc = vboxCallSetUtf8(&g_vboxSFClient);
+                rc = VbglR0SfSetUtf8(&g_vboxSFClient);
                 if (RT_SUCCESS(rc))
                 {
@@ -242 +241 @@
                 else
                 {
-                    PERROR("vboxCallSetUtf8 failed: rc=%d", rc);
+                    PERROR("VbglR0SfSetUtf8 failed: rc=%d", rc);
                 }
-                vboxDisconnect(&g_vboxSFClient);
+                VbglR0SfDisconnect(&g_vboxSFClient);
             }
             else
@@ -250 +249 @@
                 PERROR("Failed to get connection to host: rc=%d", rc);
             }
-            vboxUninit();
+            VbglR0SfUninit();
         }
         else
@@ -286 +285 @@
     }
 
-    vboxDisconnect(&g_vboxSFClient);
+    VbglR0SfDisconnect(&g_vboxSFClient);
     PINFO("VBox client disconnected");
 
-    vboxUninit();
+    VbglR0SfTerminate();
     PINFO("Low level uninit done");
 

trunk/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c

@@ -139 +139 @@
     memcpy (pShFlShareName->String.utf8, pszShare, cbShare + 1);
 
-    rc = vboxCallMapFolder (&g_vboxSFClient, pShFlShareName, &pShFlGlobalInfo->map);
+    rc = VbglR0SfMapFolder (&g_vboxSFClient, pShFlShareName, &pShFlGlobalInfo->map);
     RTMemFree(pShFlShareName);
 
@@ -145 +145 @@
     {
         RTMemFree(pShFlGlobalInfo);
-        printf("vboxCallMapFolder failed rc=%d\n", rc);
+        printf("VbglR0SfMapFolder failed rc=%d\n", rc);
         return EPROTO;
     }
@@ -170 +170 @@
     int flags = 0;
 
-    rc = vboxCallUnmapFolder(&g_vboxSFClient, &pShFlGlobalInfo->map);
+    rc = VbglR0SfUnmapFolder(&g_vboxSFClient, &pShFlGlobalInfo->map);
     if (RT_FAILURE(rc))
         printf("Failed to unmap shared folder\n");
@@ -218 +218 @@
 
     /* Initialize the R0 guest library. */
-    rc = vboxInit();
+    rc = VbglR0SfInit();
     if (RT_FAILURE(rc))
         return ENXIO;
 
     /* Connect to the host service. */
-    rc = vboxConnect(&g_vboxSFClient);
+    rc = VbglR0SfConnect(&g_vboxSFClient);
     if (RT_FAILURE(rc))
     {
         printf("Failed to get connection to host! rc=%d\n", rc);
-        vboxUninit();
+        VbglR0SfTerm();
         return ENXIO;
     }
 
-    rc = vboxCallSetUtf8 (&g_vboxSFClient);
+    rc = VbglR0SfSetUtf8(&g_vboxSFClient);
     if (RT_FAILURE (rc))
     {
-        printf("vboxCallSetUtf8 failed, rc=%d\n", rc);
-        vboxDisconnect(&g_vboxSFClient);
-        vboxUninit();
+        printf("VbglR0SfSetUtf8 failed, rc=%d\n", rc);
+        VbglR0SfDisconnect(&g_vboxSFClient);
+        VbglR0SfTerm();
         return EPROTO;
     }
@@ -247 +247 @@
 int vboxvfs_uninit(struct vfsconf *vfsp)
 {
-    vboxDisconnect(&g_vboxSFClient);
-    vboxUninit();
+    VbglR0SfDisconnect(&g_vboxSFClient);
+    VbglR0SfTerm();
 
     return 0;

trunk/src/VBox/Additions/haiku/SharedFolders/vboxsf.c

@@ -61 +61 @@
     if (RT_LIKELY(rc == B_OK)
     {
-        rc = vboxInit();
+        rc = VbglR0SfInit();
         if (RT_SUCCESS(rc))
         {
-            rc = vboxConnect(&g_clientHandle);
+            rc = VbglR0SfConnect(&g_clientHandle);
             if (RT_SUCCESS(rc))
             {
-                rc = vboxCallSetUtf8(&g_clientHandle);
+                rc = VbglR0SfSetUtf8(&g_clientHandle);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = vboxCallSetSymlinks(&g_clientHandle);
+                    rc = VbglR0SfSetSymlinks(&g_clientHandle);
                     if (RT_FAILURE(rc))
-                        LogRel((FS_NAME ":Warning! vboxCallSetSymlinks failed (rc=%d) - symlink will appear as copies.\n", rc));
+                        LogRel((FS_NAME ": Warning! VbglR0SfSetSymlinks failed (rc=%d) - symlink will appear as copies.\n", rc));
 
                     mutex_init(&g_vnodeCacheLock, "vboxsf vnode cache lock");
-                    Log((FS_NAME ":init_module succeeded.\n");
+                    Log((FS_NAME ": init_module succeeded.\n");
                     return B_OK;
                 }
                 else
-                    LogRel((FS_NAME ":vboxCallSetUtf8 failed. rc=%d\n", rc));
+                    LogRel((FS_NAME ": VbglR0SfSetUtf8 failed. rc=%d\n", rc));
             }
             else
-                LogRel((FS_NAME ":vboxConnect failed. rc=%d\n", rc));
+                LogRel((FS_NAME ": VbglR0SfConnect failed. rc=%d\n", rc));
         }
         else
-            LogRel((FS_NAME ":vboxInit failed. rc=%d\n", rc));
+            LogRel((FS_NAME ": VbglR0SfInit failed. rc=%d\n", rc));
     }
     else
-        LogRel((FS_NAME ":get_module failed for '%s'. rc=%d\n", VBOXGUEST_MODULE_NAME, rc));
+        LogRel((FS_NAME ": get_module failed for '%s'. rc=%d\n", VBOXGUEST_MODULE_NAME, rc));
 
     return B_ERROR;
@@ -99 +99 @@
     }
 
-    if (RT_FAILURE(vboxInit()))
-    {
-        dprintf("vboxInit failed\n");
+    if (RT_FAILURE(VbglR0SfInit()))
+    {
+        dprintf("VbglR0SfInit failed\n");
         return B_ERROR;
     }
 
-    if (RT_FAILURE(vboxConnect(&g_clientHandle)))
-    {
-        dprintf("vboxConnect failed\n");
+    if (RT_FAILURE(VbglR0SfConnect(&g_clientHandle)))
+    {
+        dprintf("VbglR0SfConnect failed\n");
         return B_ERROR;
     }
 
-    if (RT_FAILURE(vboxCallSetUtf8(&g_clientHandle)))
-    {
-        dprintf("vboxCallSetUtf8 failed\n");
+    if (RT_FAILURE(VbglR0SfSetUtf8(&g_clientHandle)))
+    {
+        dprintf("VbglR0SfSetUtf8 failed\n");
         return B_ERROR;
     }
 
-    if (RT_FAILURE(vboxCallSetSymlinks(&g_clientHandle)))
-    {
-        dprintf("warning: vboxCallSetSymlinks failed (old vbox?) - symlinks will appear as copies\n");
+    if (RT_FAILURE(VbglR0SfSetSymlinks(&g_clientHandle)))
+    {
+        dprintf("warning: VbglR0SfSetSymlinks failed (old vbox?) - symlinks will appear as copies\n");
     }
 
@@ -227 +227 @@
     vboxsf_volume* vbsfvolume = malloc(sizeof(vboxsf_volume));
     volume->private_volume = vbsfvolume;
-    int rv = vboxCallMapFolder(&g_clientHandle, sharename, &(vbsfvolume->map));
+    int rv = VbglR0SfMapFolder(&g_clientHandle, sharename, &(vbsfvolume->map));
     free(sharename);
 
@@ -258 +258 @@
     else
     {
-        dprintf(FS_NAME ": vboxCallMapFolder failed (%d)\n", rv);
+        dprintf(FS_NAME ": VbglR0SfMapFolder failed (%d)\n", rv);
         free(volume->private_volume);
         return vbox_err_to_haiku_err(rv);
@@ -268 +268 @@
 {
     dprintf(FS_NAME ": unmount\n");
-    vboxCallUnmapFolder(&g_clientHandle, volume->private_volume);
+    VbglR0SfUnmapFolder(&g_clientHandle, volume->private_volume);
     return B_OK;
 }
@@ -284 +284 @@
     params.Handle = SHFL_HANDLE_NIL;
     params.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
-    dprintf("sf_stat: calling vboxCallCreate, file %s, flags %x\n", vnode->path->String.utf8, params.CreateFlags);
-    rc = vboxCallCreate(&g_clientHandle, &volume->map, vnode->path, &params);
+    dprintf("sf_stat: calling VbglR0SfCreate, file %s, flags %x\n", vnode->path->String.utf8, params.CreateFlags);
+    rc = VbglR0SfCreate(&g_clientHandle, &volume->map, vnode->path, &params);
     if (rc == VERR_INVALID_NAME)
     {
@@ -293 +293 @@
     if (RT_FAILURE(rc))
     {
-        dprintf("vboxCallCreate: %d\n", params.Result);
+        dprintf("VbglR0SfCreate: %d\n", params.Result);
         return vbox_err_to_haiku_err(params.Result);
     }
     if (params.Result != SHFL_FILE_EXISTS)
     {
-        dprintf("vboxCallCreate: %d\n", params.Result);
+        dprintf("VbglR0SfCreate: %d\n", params.Result);
         return B_ENTRY_NOT_FOUND;
     }
@@ -329 +329 @@
     params.CreateFlags = SHFL_CF_DIRECTORY | SHFL_CF_ACT_OPEN_IF_EXISTS | SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READ;
 
-    int rc = vboxCallCreate(&g_clientHandle, &volume->map, vnode->path, &params);
+    int rc = VbglR0SfCreate(&g_clientHandle, &volume->map, vnode->path, &params);
     if (RT_SUCCESS(rc))
     {
@@ -349 +349 @@
     else
     {
-        dprintf(FS_NAME ": vboxCallCreate: %d\n", rc);
+        dprintf(FS_NAME ": VbglR0SfCreate: %d\n", rc);
         return vbox_err_to_haiku_err(rc);
     }
@@ -368 +368 @@
         cookie->buffer_start = cookie->buffer = malloc(cookie->buffer_length);
 
-        int rc = vboxCallDirInfo(&g_clientHandle, &volume->map, cookie->handle, cookie->path, 0, cookie->index,
+        int rc = VbglR0SfDirInfo(&g_clientHandle, &volume->map, cookie->handle, cookie->path, 0, cookie->index,
                                  &cookie->buffer_length, cookie->buffer, &cookie->num_files);
 
         if (rc != 0 && rc != VERR_NO_MORE_FILES)
         {
-            dprintf(FS_NAME ": vboxCallDirInfo failed: %d\n", rc);
+            dprintf(FS_NAME ": VbglR0SfDirInfo failed: %d\n", rc);
             free(cookie->buffer_start);
             cookie->buffer_start = NULL;
@@ -462 +462 @@
     vboxsf_dir_cookie* cookie = _cookie;
 
-    vboxCallClose(&g_clientHandle, &volume->map, cookie->handle);
+    VbglR0SfClose(&g_clientHandle, &volume->map, cookie->handle);
     free(cookie->path);
     free(cookie);
@@ -477 +477 @@
     uint32_t bytes = sizeof(SHFLVOLINFO);
 
-    int rc = vboxCallFSInfo(&g_clientHandle, &volume->map, 0,
-        (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (PSHFLDIRINFO)&volume_info);
-
+    int rc = VbglR0SfFsInfo(&g_clientHandle, &volume->map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
+                            &bytes, (PSHFLDIRINFO)&volume_info);
     if (RT_FAILURE(rc))
     {
-        dprintf(FS_NAME ": vboxCallFSInfo failed (%d)\n", rc);
+        dprintf(FS_NAME ": VbglR0SfFsInfo failed (%d)\n", rc);
         return vbox_err_to_haiku_err(rc);
     }
@@ -520 +519 @@
     }
 
-    int rc = vboxCallCreate(&g_clientHandle, &volume->map, path, &params);
+    int rc = VbglR0SfCreate(&g_clientHandle, &volume->map, path, &params);
     if (RT_SUCCESS(rc))
     {
@@ -543 +542 @@
     {
         free(path);
-        dprintf(FS_NAME ": vboxCallCreate: %d\n", rc);
+        dprintf(FS_NAME ": VbglR0SfCreate: %d\n", rc);
         return vbox_err_to_haiku_err(rc);
     }
@@ -638 +637 @@
     }
 
-    int rc = vboxCallCreate(&g_clientHandle, &volume->map, vnode->path, &params);
+    int rc = VbglR0SfCreate(&g_clientHandle, &volume->map, vnode->path, &params);
     if (!RT_SUCCESS(rc))
     {
-        dprintf("vboxCallCreate returned %d\n", rc);
+        dprintf("VbglR0SfCreate returned %d\n", rc);
         return vbox_err_to_haiku_err(rc);
     }
@@ -700 +699 @@
 
     PSHFLSTRING path = build_path(_dir->private_node, name);
-    int rc = vboxCallCreate(&g_clientHandle, &volume->map, path, &params);
+    int rc = VbglR0SfCreate(&g_clientHandle, &volume->map, path, &params);
 
     if (!RT_SUCCESS(rc))
     {
-        dprintf("vboxCallCreate returned %d\n", rc);
+        dprintf("VbglR0SfCreate returned %d\n", rc);
         free(path);
         return vbox_err_to_haiku_err(rc);
@@ -730 +729 @@
     vboxsf_file_cookie* cookie = _cookie;
 
-    int rc = vboxCallClose(&g_clientHandle, &volume->map, cookie->handle);
-    dprintf("vboxCallClose returned %d\n", rc);
+    int rc = VbglR0SfClose(&g_clientHandle, &volume->map, cookie->handle);
+    dprintf("VbglR0SfClose returned %d\n", rc);
     return vbox_err_to_haiku_err(rc);
 }
@@ -768 +767 @@
     uint32_t l = *length;
     void* other_buffer = malloc(l);  /* @todo map the user memory into kernel space here for efficiency */
-    int rc = vboxCallRead(&g_clientHandle, &volume->map, cookie->handle, pos, &l, other_buffer, false);
+    int rc = VbglR0SfRead(&g_clientHandle, &volume->map, cookie->handle, pos, &l, other_buffer, false /*fLocked*/);
     memcpy(buffer, other_buffer, l);
     free(other_buffer);
 
-    dprintf("vboxCallRead returned %d\n", rc);
+    dprintf("VbglR0SfRead returned %d\n", rc);
     *length = l;
     return vbox_err_to_haiku_err(rc);
@@ -790 +789 @@
     void* other_buffer = malloc(l);  /* @todo map the user memory into kernel space here for efficiency */
     memcpy(other_buffer, buffer, l);
-    int rc = vboxCallWrite(&g_clientHandle, &volume->map, cookie->handle, pos, &l, other_buffer, false);
+    int rc = VbglR0SfWrite(&g_clientHandle, &volume->map, cookie->handle, pos, &l, other_buffer, false /*fLocked*/);
     free(other_buffer);
 
@@ -816 +815 @@
 
     PSHFLSTRING path = build_path(parent->private_node, name);
-    int rc = vboxCallCreate(&g_clientHandle, &volume->map, path, &params);
+    int rc = VbglR0SfCreate(&g_clientHandle, &volume->map, path, &params);
     free(path);
     /** @todo r=ramshankar: we should perhaps also check rc here and change
@@ -822 +821 @@
     if (params.Handle == SHFL_HANDLE_NIL)
         return vbox_err_to_haiku_err(rc);
-    else
-    {
-        vboxCallClose(&g_clientHandle, &volume->map, params.Handle);
-        return B_OK;
-    }
+    VbglR0SfClose(&g_clientHandle, &volume->map, params.Handle);
+    return B_OK;
 }
 
@@ -835 +831 @@
 
     PSHFLSTRING path = build_path(parent->private_node, name);
-    int rc = vboxCallRemove(&g_clientHandle, &volume->map, path, SHFL_REMOVE_DIR);
+    int rc = VbglR0SfRemove(&g_clientHandle, &volume->map, path, SHFL_REMOVE_DIR);
     free(path);
 
@@ -847 +843 @@
 
     PSHFLSTRING path = build_path(parent->private_node, name);
-    int rc = vboxCallRemove(&g_clientHandle, &volume->map, path, SHFL_REMOVE_FILE);
+    int rc = VbglR0SfRemove(&g_clientHandle, &volume->map, path, SHFL_REMOVE_FILE);
     free(path);
 
@@ -865 +861 @@
     PSHFLSTRING oldpath = build_path(fromDir->private_node, fromName);
     PSHFLSTRING newpath = build_path(toDir->private_node, toName);
-    int rc = vboxCallRename(&g_clientHandle, &volume->map, oldpath, newpath, SHFL_RENAME_FILE | SHFL_RENAME_REPLACE_IF_EXISTS);
+    int rc = VbglR0SfRename(&g_clientHandle, &volume->map, oldpath, newpath, SHFL_RENAME_FILE | SHFL_RENAME_REPLACE_IF_EXISTS);
     free(oldpath);
     free(newpath);
@@ -882 +878 @@
     RT_ZERO(stuff);
 
-    int rc = vboxCallSymlink(&g_clientHandle, &volume->map, linkpath, target, &stuff);
+    int rc = VbglR0SfSymlink(&g_clientHandle, &volume->map, linkpath, target, &stuff);
 
     free(target);
@@ -896 +892 @@
     vboxsf_vnode* vnode = link->private_node;
 
-    int rc = vboxReadLink(&g_clientHandle, &volume->map, vnode->path, *_bufferSize, buffer);
+    int rc = VbglR0SfReadLink(&g_clientHandle, &volume->map, vnode->path, *_bufferSize, buffer);
     *_bufferSize = strlen(buffer);
 

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

@@ -63 +63 @@
                        ;
 
-    LogFunc(("sf_dir_open(): calling vboxCallCreate, folder %s, flags %#x\n",
+    LogFunc(("sf_dir_open(): calling VbglR0SfCreate, folder %s, flags %#x\n",
              sf_i->path->String.utf8, params.CreateFlags));
-    rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, &params);
+    rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, &params);
     if (RT_SUCCESS(rc))
     {
@@ -77 +77 @@
             err = -ENOENT;
 
-        rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
+        rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
         if (RT_FAILURE(rc))
-            LogFunc(("sf_dir_open(): vboxCallClose(%s) after err=%d failed rc=%Rrc\n",
+            LogFunc(("sf_dir_open(): VbglR0SfClose(%s) after err=%d failed rc=%Rrc\n",
                      sf_i->path->String.utf8, err, rc));
     }
@@ -174 +174 @@
                            ;
 
-        LogFunc(("sf_getdent: calling vboxCallCreate, folder %s, flags %#x\n",
+        LogFunc(("sf_getdent: calling VbglR0SfCreate, folder %s, flags %#x\n",
                   sf_i->path->String.utf8, params.CreateFlags));
-        rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, &params);
+        rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, &params);
         if (RT_FAILURE(rc))
         {
-            LogFunc(("vboxCallCreate(%s) failed rc=%Rrc\n",
+            LogFunc(("VbglR0SfCreate(%s) failed rc=%Rrc\n",
                         sf_i->path->String.utf8, rc));
             return -EPERM;
@@ -193 +193 @@
         sf_dir_info_empty(sf_d);
         err = sf_dir_read_all(sf_g, sf_i, sf_d, params.Handle);
-        rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
+        rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
         if (RT_FAILURE(rc))
-            LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
+            LogFunc(("VbglR0SfClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
         if (err)
             return err;
@@ -562 +562 @@
     params.Info.Attr.enmAdditional = RTFSOBJATTRADD_NOTHING;
 
-    LogFunc(("sf_create_aux: calling vboxCallCreate, folder %s, flags %#x\n",
+    LogFunc(("sf_create_aux: calling VbglR0SfCreate, folder %s, flags %#x\n",
               path->String.utf8, params.CreateFlags));
-    rc = vboxCallCreate(&client_handle, &sf_g->map, path, &params);
+    rc = VbglR0SfCreate(&client_handle, &sf_g->map, path, &params);
     if (RT_FAILURE(rc))
     {
@@ -573 +573 @@
         }
         err = -EPROTO;
-        LogFunc(("(%d): vboxCallCreate(%s) failed rc=%Rrc\n",
+        LogFunc(("(%d): VbglR0SfCreate(%s) failed rc=%Rrc\n",
                     fDirectory, sf_i->path->String.utf8, rc));
         goto fail1;
@@ -602 +602 @@
     if (fDirectory)
     {
-        rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
+        rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
         if (RT_FAILURE(rc))
-            LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", fDirectory, rc));
+            LogFunc(("(%d): VbglR0SfClose failed rc=%Rrc\n", fDirectory, rc));
     }
 
@@ -611 +611 @@
 
 fail2:
-    rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
+    rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
     if (RT_FAILURE(rc))
-        LogFunc(("(%d): vboxCallClose failed rc=%Rrc\n", fDirectory, rc));
+        LogFunc(("(%d): VbglR0SfClose failed rc=%Rrc\n", fDirectory, rc));
 
 fail1:
@@ -691 +691 @@
         && ((dentry->d_inode->i_mode & S_IFLNK) == S_IFLNK))
         fFlags |= SHFL_REMOVE_SYMLINK;
-    rc = vboxCallRemove(&client_handle, &sf_g->map, path, fFlags);
+    rc = VbglR0SfRemove(&client_handle, &sf_g->map, path, fFlags);
     if (RT_FAILURE(rc))
     {
-        LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Rrc\n", fDirectory,
-                    path->String.utf8, rc));
+        LogFunc(("(%d): VbglR0SfRemove(%s) failed rc=%Rrc\n", fDirectory, path->String.utf8, rc));
         err = -RTErrConvertToErrno(rc);
         goto fail1;
@@ -785 +784 @@
             int fDir = ((old_dentry->d_inode->i_mode & S_IFDIR) != 0);
 
-            rc = vboxCallRename(&client_handle, &sf_g->map, old_path,
+            rc = VbglR0SfRename(&client_handle, &sf_g->map, old_path,
                                 new_path, fDir ? 0 : SHFL_RENAME_FILE | SHFL_RENAME_REPLACE_IF_EXISTS);
             if (RT_SUCCESS(rc))
@@ -797 +796 @@
             else
             {
-                LogFunc(("vboxCallRename failed rc=%Rrc\n", rc));
+                LogFunc(("VbglR0SfRename failed rc=%Rrc\n", rc));
                 err = -RTErrConvertToErrno(rc);
                 kfree(new_path);
@@ -840 +839 @@
     memcpy(ssymname->String.utf8, symname, symname_len);
 
-    rc = vboxCallSymlink(&client_handle, &sf_g->map, path, ssymname, &info);
+    rc = VbglR0SfSymlink(&client_handle, &sf_g->map, path, ssymname, &info);
     kfree(ssymname);
 
@@ -850 +849 @@
             goto fail1;
         }
-        LogFunc(("vboxCallSymlink(%s) failed rc=%Rrc\n",
+        LogFunc(("VbglR0SfSymlink(%s) failed rc=%Rrc\n",
                     sf_i->path->String.utf8, rc));
         err = -EPROTO;

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

@@ -37 +37 @@
     {
         error = 0;
-        rc = vboxReadLink(&client_handle, &sf_g->map, sf_i->path, PATH_MAX, path);
+        rc = VbglR0SfReadLink(&client_handle, &sf_g->map, sf_i->path, PATH_MAX, path);
         if (RT_FAILURE(rc))
         {
-            LogFunc(("vboxReadLink failed, caller=%s, rc=%Rrc\n", __func__, rc));
+            LogFunc(("VbglR0SfReadLink failed, caller=%s, rc=%Rrc\n", __func__, rc));
             free_page((unsigned long)path);
             error = -EPROTO;

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

@@ -64 +64 @@
      *        contiguous in physical memory (kmalloc or single page), we should
      *        use a physical address here to speed things up. */
-    int rc = vboxCallRead(&client_handle, &sf_g->map, sf_r->handle,
+    int rc = VbglR0SfRead(&client_handle, &sf_g->map, sf_r->handle,
                           pos, nread, buf, false /* already locked? */);
     if (RT_FAILURE(rc))
     {
-        LogFunc(("vboxCallRead failed. caller=%s, rc=%Rrc\n", caller, rc));
+        LogFunc(("VbglR0SfRead failed. caller=%s, rc=%Rrc\n", caller, rc));
         return -EPROTO;
     }
@@ -81 +81 @@
      *        contiguous in physical memory (kmalloc or single page), we should
      *        use a physical address here to speed things up. */
-    int rc = vboxCallWrite(&client_handle, &sf_g->map, sf_r->handle,
+    int rc = VbglR0SfWrite(&client_handle, &sf_g->map, sf_r->handle,
                            pos, nwritten, buf, false /* already locked? */);
     if (RT_FAILURE(rc))
     {
-        LogFunc(("vboxCallWrite failed. caller=%s, rc=%Rrc\n",
+        LogFunc(("VbglR0SfWrite failed. caller=%s, rc=%Rrc\n",
                     caller, rc));
         return -EPROTO;
@@ -374 +374 @@
 
     params.Info.Attr.fMode = inode->i_mode;
-    LogFunc(("sf_reg_open: calling vboxCallCreate, file %s, flags=%#x, %#x\n",
+    LogFunc(("sf_reg_open: calling VbglR0SfCreate, file %s, flags=%#x, %#x\n",
               sf_i->path->String.utf8 , file->f_flags, params.CreateFlags));
-    rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, &params);
+    rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, &params);
     if (RT_FAILURE(rc))
     {
-        LogFunc(("vboxCallCreate failed flags=%d,%#x rc=%Rrc\n",
+        LogFunc(("VbglR0SfCreate failed flags=%d,%#x rc=%Rrc\n",
                   file->f_flags, params.CreateFlags, rc));
         kfree(sf_r);
@@ -439 +439 @@
         filemap_fdatawait(inode->i_mapping);
 #endif
-    rc = vboxCallClose(&client_handle, &sf_g->map, sf_r->handle);
+    rc = VbglR0SfClose(&client_handle, &sf_g->map, sf_r->handle);
     if (RT_FAILURE(rc))
-        LogFunc(("vboxCallClose failed rc=%Rrc\n", rc));
+        LogFunc(("VbglR0SfClose failed rc=%Rrc\n", rc));
 
     kfree(sf_r);
@@ -482 +482 @@
 #endif
 
-    /* Don't use GFP_HIGHUSER as long as sf_reg_read_aux() calls vboxCallRead()
+    /* Don't use GFP_HIGHUSER as long as sf_reg_read_aux() calls VbglR0SfRead()
      * which works on virtual addresses. On Linux cannot reliably determine the
      * physical address for high memory, see rtR0MemObjNativeLockKernel(). */

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

@@ -183 +183 @@
     params.Handle = SHFL_HANDLE_NIL;
     params.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
-    LogFunc(("sf_stat: calling vboxCallCreate, file %s, flags %#x\n",
+    LogFunc(("sf_stat: calling VbglR0SfCreate, file %s, flags %#x\n",
              path->String.utf8, params.CreateFlags));
-    rc = vboxCallCreate(&client_handle, &sf_g->map, path, &params);
+    rc = VbglR0SfCreate(&client_handle, &sf_g->map, path, &params);
     if (rc == VERR_INVALID_NAME)
     {
@@ -193 +193 @@
     if (RT_FAILURE(rc))
     {
-        LogFunc(("vboxCallCreate(%s) failed.  caller=%s, rc=%Rrc\n",
+        LogFunc(("VbglR0SfCreate(%s) failed.  caller=%s, rc=%Rrc\n",
                     path->String.utf8, rc, caller));
         return -EPROTO;
@@ -200 +200 @@
     {
         if (!ok_to_fail)
-            LogFunc(("vboxCallCreate(%s) file does not exist.  caller=%s, result=%d\n",
+            LogFunc(("VbglR0SfCreate(%s) file does not exist.  caller=%s, result=%d\n",
                         path->String.utf8, params.Result, caller));
         return -ENOENT;
@@ -329 +329 @@
         params.CreateFlags |= SHFL_CF_ACCESS_WRITE;
 
-    rc = vboxCallCreate(&client_handle, &sf_g->map, sf_i->path, &params);
+    rc = VbglR0SfCreate(&client_handle, &sf_g->map, sf_i->path, &params);
     if (RT_FAILURE(rc))
     {
-        LogFunc(("vboxCallCreate(%s) failed rc=%Rrc\n",
+        LogFunc(("VbglR0SfCreate(%s) failed rc=%Rrc\n",
                  sf_i->path->String.utf8, rc));
         err = -RTErrConvertToErrno(rc);
@@ -379 +379 @@
 
         cbBuffer = sizeof(info);
-        rc = vboxCallFSInfo(&client_handle, &sf_g->map, params.Handle,
-                SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer,
-                (PSHFLDIRINFO)&info);
+        rc = VbglR0SfFsInfo(&client_handle, &sf_g->map, params.Handle,
+                            SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer,
+                            (PSHFLDIRINFO)&info);
         if (RT_FAILURE(rc))
         {
-            LogFunc(("vboxCallFSInfo(%s, FILE) failed rc=%Rrc\n",
+            LogFunc(("VbglR0SfFsInfo(%s, FILE) failed rc=%Rrc\n",
                         sf_i->path->String.utf8, rc));
             err = -RTErrConvertToErrno(rc);
@@ -396 +396 @@
         info.cbObject = iattr->ia_size;
         cbBuffer = sizeof(info);
-        rc = vboxCallFSInfo(&client_handle, &sf_g->map, params.Handle,
+        rc = VbglR0SfFsInfo(&client_handle, &sf_g->map, params.Handle,
                             SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuffer,
                             (PSHFLDIRINFO)&info);
         if (RT_FAILURE(rc))
         {
-            LogFunc(("vboxCallFSInfo(%s, SIZE) failed rc=%Rrc\n",
+            LogFunc(("VbglR0SfFsInfo(%s, SIZE) failed rc=%Rrc\n",
                         sf_i->path->String.utf8, rc));
             err = -RTErrConvertToErrno(rc);
@@ -408 +408 @@
     }
 
-    rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
+    rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
     if (RT_FAILURE(rc))
-        LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
+        LogFunc(("VbglR0SfClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
 
     return sf_inode_revalidate(dentry);
 
 fail1:
-    rc = vboxCallClose(&client_handle, &sf_g->map, params.Handle);
+    rc = VbglR0SfClose(&client_handle, &sf_g->map, params.Handle);
     if (RT_FAILURE(rc))
-        LogFunc(("vboxCallClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
+        LogFunc(("VbglR0SfClose(%s) failed rc=%Rrc\n", sf_i->path->String.utf8, rc));
 
 fail2:
@@ -794 +794 @@
         cbSize = b->cbFree;
 
-        rc = vboxCallDirInfo(&client_handle, &sf_g->map, handle, mask,
+        rc = VbglR0SfDirInfo(&client_handle, &sf_g->map, handle, mask,
                              0, 0, &cbSize, buf, &cEntries);
         switch (rc)
@@ -808 +808 @@
             default:
                 err = -RTErrConvertToErrno(rc);
-                LogFunc(("vboxCallDirInfo failed rc=%Rrc\n", rc));
+                LogFunc(("VbglR0SfDirInfo failed rc=%Rrc\n", rc));
                 goto fail1;
         }
@@ -837 +837 @@
     sf_g = GET_GLOB_INFO(sb);
     cbBuffer = sizeof(SHFLVolumeInfo);
-    rc = vboxCallFSInfo(&client_handle, &sf_g->map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
+    rc = VbglR0SfFsInfo(&client_handle, &sf_g->map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
                         &cbBuffer, (PSHFLDIRINFO)&SHFLVolumeInfo);
     if (RT_FAILURE(rc))

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

@@ -145 +145 @@
     }
 
-    rc = vboxCallMapFolder(&client_handle, str_name, &sf_g->map);
+    rc = VbglR0SfMapFolder(&client_handle, str_name, &sf_g->map);
     kfree(str_name);
 
@@ -151 +151 @@
     {
         err = -EPROTO;
-        LogFunc(("vboxCallMapFolder failed rc=%d\n", rc));
+        LogFunc(("VbglR0SfMapFolder failed rc=%d\n", rc));
         goto fail2;
     }
@@ -194 +194 @@
 
     TRACE();
-    rc = vboxCallUnmapFolder(&client_handle, &sf_g->map);
+    rc = VbglR0SfUnmapFolder(&client_handle, &sf_g->map);
     if (RT_FAILURE(rc))
-        LogFunc(("vboxCallUnmapFolder failed rc=%d\n", rc));
+        LogFunc(("VbglR0SfUnmapFolder failed rc=%d\n", rc));
 
     if (sf_g->nls)
@@ -595 +595 @@
     }
 
-    rcVBox = vboxInit();
+    rcVBox = VbglR0SfInit();
     if (RT_FAILURE(rcVBox))
     {
-        LogRelFunc(("vboxInit failed, rc=%d\n", rcVBox));
+        LogRelFunc(("VbglR0SfInit failed, rc=%d\n", rcVBox));
         rcRet = -EPROTO;
         goto fail0;
     }
 
-    rcVBox = vboxConnect(&client_handle);
+    rcVBox = VbglR0SfConnect(&client_handle);
     if (RT_FAILURE(rcVBox))
     {
-        LogRelFunc(("vboxConnect failed, rc=%d\n", rcVBox));
+        LogRelFunc(("VbglR0SfConnect failed, rc=%d\n", rcVBox));
         rcRet = -EPROTO;
         goto fail1;
     }
 
-    rcVBox = vboxCallSetUtf8(&client_handle);
+    rcVBox = VbglR0SfSetUtf8(&client_handle);
     if (RT_FAILURE(rcVBox))
     {
-        LogRelFunc(("vboxCallSetUtf8 failed, rc=%d\n", rcVBox));
+        LogRelFunc(("VbglR0SfSetUtf8 failed, rc=%d\n", rcVBox));
         rcRet = -EPROTO;
         goto fail2;
@@ -622 +622 @@
     if (!follow_symlinks)
     {
-        rcVBox = vboxCallSetSymlinks(&client_handle);
+        rcVBox = VbglR0SfSetSymlinks(&client_handle);
         if (RT_FAILURE(rcVBox))
         {
@@ -639 +639 @@
 
 fail2:
-    vboxDisconnect(&client_handle);
+    VbglR0SfDisconnect(&client_handle);
 
 fail1:
-    vboxUninit();
+    VbglR0SfTerm();
 
 fail0:
@@ -653 +653 @@
     TRACE();
 
-    vboxDisconnect(&client_handle);
-    vboxUninit();
+    VbglR0SfDisconnect(&client_handle);
+    VbglR0SfTerm();
     unregister_filesystem(&vboxsf_fs_type);
 }

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c

@@ -90 +90 @@
                 return NULL;
         }
-        rc = vboxInit();
+        rc = VbglR0SfInit();
         if (RT_SUCCESS(rc))
         {
-                rc = vboxConnect(&vbox_client);
+                rc = VbglR0SfConnect(&vbox_client);
                 if (RT_SUCCESS(rc))
                 {
-                        rc = vboxCallSetUtf8(&vbox_client);
+                        rc = VbglR0SfSetUtf8(&vbox_client);
                         if (RT_SUCCESS(rc))
                         {
@@ -102 +102 @@
                         }
                         else
-                                cmn_err(CE_WARN, "sfprov_connect: vboxCallSetUtf8() failed\n");
-
-                        vboxDisconnect(&vbox_client);
+                                cmn_err(CE_WARN, "sfprov_connect: VbglR0SfSetUtf8() failed\n");
+
+                        VbglR0SfDisconnect(&vbox_client);
                 }
                 else
-                        cmn_err(CE_WARN, "sfprov_connect: vboxConnect() failed rc=%d\n", rc);
-                vboxUninit();
+                        cmn_err(CE_WARN, "sfprov_connect: VbglR0SfConnect() failed rc=%d\n", rc);
+                VbglR0SfTerm();
         }
         else
-                cmn_err(CE_WARN, "sfprov_connect: vboxInit() failed rc=%d\n", rc);
+                cmn_err(CE_WARN, "sfprov_connect: VbglR0SfInit() failed rc=%d\n", rc);
         return (NULL);
 }
@@ -120 +120 @@
         if (conn != (sfp_connection_t *)&vbox_client)
                 cmn_err(CE_WARN, "sfprov_disconnect: bad argument\n");
-        vboxDisconnect(&vbox_client);
-        vboxUninit();
+        VbglR0SfDisconnect(&vbox_client);
+        VbglR0SfTerm();
 }
 
@@ -135 +135 @@
         m = kmem_zalloc(sizeof (*m), KM_SLEEP);
         str = sfprov_string(path, &size);
-        rc = vboxCallMapFolder(&vbox_client, str, &m->map);
+        rc = VbglR0SfMapFolder(&vbox_client, str, &m->map);
         if (RT_FAILURE(rc)) {
-                cmn_err(CE_WARN, "sfprov_mount: vboxCallMapFolder() failed. path=%s rc=%d\n", path, rc);
+                cmn_err(CE_WARN, "sfprov_mount: VbglR0SfMapFolder() failed. path=%s rc=%d\n", path, rc);
                 kmem_free(m, sizeof (*m));
                 *mnt = NULL;
@@ -154 +154 @@
         int rc;
 
-        rc = vboxCallUnmapFolder(&vbox_client, &mnt->map);
+        rc = VbglR0SfUnmapFolder(&vbox_client, &mnt->map);
         if (RT_FAILURE(rc)) {
-                cmn_err(CE_WARN, "sfprov_mount: vboxCallUnmapFolder() failed rc=%d\n", rc);
+                cmn_err(CE_WARN, "sfprov_mount: VbglR0SfUnmapFolder() failed rc=%d\n", rc);
                 rc = EINVAL;
         } else {
@@ -175 +175 @@
         uint32_t bytes = sizeof(SHFLVOLINFO);
 
-        rc = vboxCallFSInfo(&vbox_client, &mnt->map, 0,
-            (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (SHFLDIRINFO *)&info);
+        rc = VbglR0SfFsInfo(&vbox_client, &mnt->map, 0, SHFL_INFO_GET | SHFL_INFO_VOLUME,
+                            &bytes, (SHFLDIRINFO *)&info);
         if (RT_FAILURE(rc))
                 return (EINVAL);
@@ -336 +336 @@
         parms.CreateFlags = SHFL_CF_ACT_CREATE_IF_NEW |
             SHFL_CF_ACT_REPLACE_IF_EXISTS | SHFL_CF_ACCESS_READWRITE;
-        rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+        rc = VbglR0SfCreate(&vbox_client, &mnt->map, str, &parms);
         kmem_free(str, size);
 
@@ -342 +342 @@
         {
                 if (rc != VERR_ACCESS_DENIED && rc != VERR_WRITE_PROTECT)
-                        cmn_err(CE_WARN, "sfprov_create: vboxCallCreate failed! path=%s rc=%d\n", path, rc);
+                        cmn_err(CE_WARN, "sfprov_create: VbglR0SfCreate failed! path=%s rc=%d\n", path, rc);
                 return (sfprov_vbox2errno(rc));
         }
@@ -379 +379 @@
          * Open the host directory.
          */
-        rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+        rc = VbglR0SfCreate(&vbox_client, &mnt->map, str, &parms);
 
         /*
@@ -439 +439 @@
          * Open/create the host file.
          */
-        rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+        rc = VbglR0SfCreate(&vbox_client, &mnt->map, str, &parms);
 
         /*
@@ -467 +467 @@
         int rc;
 
-        rc = vboxCallClose(&vbox_client, &fp->map, fp->handle);
+        rc = VbglR0SfClose(&vbox_client, &fp->map, fp->handle);
         kmem_free(fp, sizeof(sfp_file_t));
         return (0);
@@ -477 +477 @@
         int rc;
 
-        rc = vboxCallRead(&vbox_client, &fp->map, fp->handle, offset,
-            numbytes, (uint8_t *)buffer, 0);    /* what is that last arg? */
+        rc = VbglR0SfRead(&vbox_client, &fp->map, fp->handle, offset,
+                          numbytes, (uint8_t *)buffer, 0 /*fLocked*/);
         if (RT_FAILURE(rc))
                 return (EINVAL);
@@ -489 +489 @@
         int rc;
 
-        rc = vboxCallWrite(&vbox_client, &fp->map, fp->handle, offset,
-            numbytes, (uint8_t *)buffer, 0);    /* what is that last arg? */
+        rc = VbglR0SfWrite(&vbox_client, &fp->map, fp->handle, offset,
+                           numbytes, (uint8_t *)buffer, 0 /*fLocked*/);
         if (RT_FAILURE(rc))
                 return (EINVAL);
@@ -501 +501 @@
         int rc;
 
-        rc = vboxCallFlush(&vbox_client, &fp->map, fp->handle);
+        rc = VbglR0SfFlush(&vbox_client, &fp->map, fp->handle);
         if (RT_FAILURE(rc))
                 return (EIO);
@@ -520 +520 @@
         parms.Info.cbObject = 0;
         parms.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
-        rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+        rc = VbglR0SfCreate(&vbox_client, &mnt->map, str, &parms);
         kmem_free(str, size);
 
@@ -644 +644 @@
                           | SHFL_CF_ACCESS_ATTR_WRITE;
 
-        rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+        rc = VbglR0SfCreate(&vbox_client, &mnt->map, str, &parms);
 
         if (RT_FAILURE(rc)) {
-                cmn_err(CE_WARN, "sfprov_set_attr: vboxCallCreate(%s) failed rc=%d\n",
+                cmn_err(CE_WARN, "sfprov_set_attr: VbglR0SfCreate(%s) failed rc=%d\n",
                     path, rc);
                 err = EINVAL;
@@ -668 +668 @@
 
         bytes = sizeof(info);
-        rc = vboxCallFSInfo(&vbox_client, &mnt->map, parms.Handle,
-            (SHFL_INFO_SET | SHFL_INFO_FILE), &bytes, (SHFLDIRINFO *)&info);
+        rc = VbglR0SfFsInfo(&vbox_client, &mnt->map, parms.Handle, SHFL_INFO_SET | SHFL_INFO_FILE,
+                            &bytes, (SHFLDIRINFO *)&info);
         if (RT_FAILURE(rc)) {
                 if (rc != VERR_ACCESS_DENIED && rc != VERR_WRITE_PROTECT)
                 {
-                        cmn_err(CE_WARN, "sfprov_set_attr: vboxCallFSInfo(%s, FILE) failed rc=%d\n",
+                        cmn_err(CE_WARN, "sfprov_set_attr: VbglR0SfFsInfo(%s, FILE) failed rc=%d\n",
                     path, rc);
                 }
@@ -683 +683 @@
 
 fail1:
-        rc = vboxCallClose(&vbox_client, &mnt->map, parms.Handle);
+        rc = VbglR0SfClose(&vbox_client, &mnt->map, parms.Handle);
         if (RT_FAILURE(rc)) {
-                cmn_err(CE_WARN, "sfprov_set_attr: vboxCallClose(%s) failed rc=%d\n",
+                cmn_err(CE_WARN, "sfprov_set_attr: VbglR0SfClose(%s) failed rc=%d\n",
                     path, rc);
         }
@@ -710 +710 @@
                           | SHFL_CF_ACCESS_WRITE;
 
-        rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+        rc = VbglR0SfCreate(&vbox_client, &mnt->map, str, &parms);
 
         if (RT_FAILURE(rc)) {
-                cmn_err(CE_WARN, "sfprov_set_size: vboxCallCreate(%s) failed rc=%d\n",
+                cmn_err(CE_WARN, "sfprov_set_size: VbglR0SfCreate(%s) failed rc=%d\n",
                     path, rc);
                 err = EINVAL;
@@ -726 +726 @@
         info.cbObject = size;
         bytes = sizeof(info);
-        rc = vboxCallFSInfo(&vbox_client, &mnt->map, parms.Handle,
-            (SHFL_INFO_SET | SHFL_INFO_SIZE), &bytes, (SHFLDIRINFO *)&info);
+        rc = VbglR0SfFsInfo(&vbox_client, &mnt->map, parms.Handle, SHFL_INFO_SET | SHFL_INFO_SIZE,
+                            &bytes, (SHFLDIRINFO *)&info);
         if (RT_FAILURE(rc)) {
-                cmn_err(CE_WARN, "sfprov_set_size: vboxCallFSInfo(%s, SIZE) failed rc=%d\n",
+                cmn_err(CE_WARN, "sfprov_set_size: VbglR0SfFsInfo(%s, SIZE) failed rc=%d\n",
                     path, rc);
                 err = sfprov_vbox2errno(rc);
@@ -738 +738 @@
 
 fail1:
-        rc = vboxCallClose(&vbox_client, &mnt->map, parms.Handle);
+        rc = VbglR0SfClose(&vbox_client, &mnt->map, parms.Handle);
         if (RT_FAILURE(rc)) {
-                cmn_err(CE_WARN, "sfprov_set_size: vboxCallClose(%s) failed rc=%d\n",
+                cmn_err(CE_WARN, "sfprov_set_size: VbglR0SfClose(%s) failed rc=%d\n",
                     path, rc);
         }
@@ -771 +771 @@
         parms.CreateFlags = SHFL_CF_DIRECTORY | SHFL_CF_ACT_CREATE_IF_NEW |
             SHFL_CF_ACT_FAIL_IF_EXISTS | SHFL_CF_ACCESS_READ;
-        rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
+        rc = VbglR0SfCreate(&vbox_client, &mnt->map, str, &parms);
         kmem_free(str, size);
 
@@ -794 +794 @@
         int rc;
 
-        rc = vboxCallSetSymlinks(&vbox_client);
+        rc = VbglR0SfSetSymlinks(&vbox_client);
         if (RT_FAILURE(rc))
                 return (sfprov_vbox2errno(rc));
@@ -809 +809 @@
 
         str = sfprov_string(path, &size);
-        rc = vboxCallRemove(&vbox_client, &mnt->map, str,
-                SHFL_REMOVE_FILE | (is_link ? SHFL_REMOVE_SYMLINK : 0));
+        rc = VbglR0SfRemove(&vbox_client, &mnt->map, str,
+                            SHFL_REMOVE_FILE | (is_link ? SHFL_REMOVE_SYMLINK : 0));
         kmem_free(str, size);
         if (RT_FAILURE(rc))
@@ -830 +830 @@
         str = sfprov_string(path, &size);
 
-        rc = vboxReadLink(&vbox_client, &mnt->map, str, (uint32_t) tgt_size,
+        rc = VbglR0SfReadLink(&vbox_client, &mnt->map, str, (uint32_t) tgt_size,
             target);
         if (RT_FAILURE(rc))
@@ -854 +854 @@
         tgt = sfprov_string(target, &tgt_size);
 
-        rc = vboxCallSymlink(&vbox_client, &mnt->map, lnk, tgt, &info);
+        rc = VbglR0SfSymlink(&vbox_client, &mnt->map, lnk, tgt, &info);
         if (RT_FAILURE(rc)) {
                 rc = sfprov_vbox2errno(rc);
@@ -878 +878 @@
 
         str = sfprov_string(path, &size);
-        rc = vboxCallRemove(&vbox_client, &mnt->map, str, SHFL_REMOVE_DIR);
+        rc = VbglR0SfRemove(&vbox_client, &mnt->map, str, SHFL_REMOVE_DIR);
         kmem_free(str, size);
         if (RT_FAILURE(rc))
@@ -894 +894 @@
         old = sfprov_string(from, &old_size);
         new = sfprov_string(to, &new_size);
-        rc = vboxCallRename(&vbox_client, &mnt->map, old, new,
-            (is_dir ? SHFL_RENAME_DIR : SHFL_RENAME_FILE) |
-            SHFL_RENAME_REPLACE_IF_EXISTS);
+        rc = VbglR0SfRename(&vbox_client, &mnt->map, old, new,
+                            (is_dir ? SHFL_RENAME_DIR : SHFL_RENAME_FILE) | SHFL_RENAME_REPLACE_IF_EXISTS);
         kmem_free(old, old_size);
         kmem_free(new, new_size);
@@ -974 +973 @@
 
         /*
-         * Now loop using vboxCallDirInfo
+         * Now loop using VbglR0SfDirInfo
          */
         infobuff = kmem_alloc(infobuff_alloc, KM_SLEEP);
@@ -985 +984 @@
         for (;;) {
                 numbytes = infobuff_alloc;
-                error = vboxCallDirInfo(&vbox_client, &fp->map, fp->handle,
-                    mask_str, 0, 0, &numbytes, infobuff, &nents);
+                error = VbglR0SfDirInfo(&vbox_client, &fp->map, fp->handle,
+                                        mask_str, 0, 0, &numbytes, infobuff, &nents);
                 switch (error) {