Changeset 68104 in vbox for trunk

Timestamp:

Jul 25, 2017 9:40:46 AM (7 years ago)

Author:

vboxsync

Message:

Linux shared folder driver: stop using VbglR0SfInit and Term.

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Stop using the VbglR0SfInit and Term symbols in the Linux shared folders guest
driver and use VbglR0HGCMInit and Terminate instead. Remove the former
symbols from the guest library altogether on Linux. After this, the Linux
shared folder driver only depends on the HGCM code in the guest library.

Signed-off-by: Hans de Goede <hdegoede@…>
Reworked by Oracle.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c (modified) (2 diffs)
• linux/sharedfolders/vfsmod.c (modified) (4 diffs)

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

@@ -56 +56 @@
 
 
+/** @todo We only need HGCM, not physical memory, so other guests should also
+ *        switch to calling vbglR0HGCMInit() and vbglR0HGCMTerminate() instead
+ *        of VbglR0SfInit() and VbglR0SfTerm(). */
+#ifndef RT_OS_LINUX
 DECLVBGL(int) VbglR0SfInit(void)
 {
@@ -65 +69 @@
     VbglTerminate();
 }
+#endif
 
 DECLVBGL(int) VbglR0SfConnect(PVBGLSFCLIENT pClient)

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

@@ -33 +33 @@
 #include "revision-generated.h"
 #include "product-generated.h"
+#include "VBGLInternal.h"
 
 MODULE_DESCRIPTION(VBOX_PRODUCT " VFS Module for Host File System Access");
@@ -602 +603 @@
     }
 
-    rcVBox = VbglR0SfInit();
+    rcVBox = VbglR0HGCMInit();
     if (RT_FAILURE(rcVBox))
     {
-        LogRelFunc(("VbglR0SfInit failed, rc=%d\n", rcVBox));
+        LogRelFunc(("VbglR0HGCMInit failed, rc=%d\n", rcVBox));
         rcRet = -EPROTO;
         goto fail0;
@@ -649 +650 @@
 
 fail1:
-    VbglR0SfTerm();
+    VbglR0HGCMTerminate();
 
 fail0:
@@ -661 +662 @@
 
     VbglR0SfDisconnect(&client_handle);
-    VbglR0SfTerm();
+    VbglR0HGCMTerminate();
     unregister_filesystem(&vboxsf_fs_type);
 }