Changeset 31202 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Jul 29, 2010 12:41:03 PM (15 years ago)

Author:

vboxsync

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

64204

Message:

Shared Folders/VBoxService: Added Linux + Solaris support.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• Makefile.kmk (modified) (5 diffs)
• VBoxService.cpp (modified) (1 diff)
• VBoxServiceAutoMount.cpp (added)
• VBoxServiceInternal.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

@@ -50 +50 @@
  VBoxService_DEFS        += VBOXSERVICE_CPUHOTPLUG
 endif
+ifdef VBOX_WITH_SHARED_FOLDERS
+ # darwin freebsd
+ if1of ($(KBUILD_TARGET), linux solaris)
+  VBoxService_DEFS        += VBOX_WITH_SHARED_FOLDERS
+ endif
+endif
 
 VBoxService_SOURCES       = \
@@ -56 +62 @@
         VBoxServiceUtils.cpp \
         VBoxServiceStats.cpp
+
 ifdef VBOX_WITH_GUEST_CONTROL
  VBoxService_SOURCES    += \
@@ -61 +68 @@
         VBoxServiceControlExec.cpp
 endif
+
 ifdef VBOX_WITH_MEMBALLOON
  VBoxService_SOURCES    += \
@@ -69 +77 @@
         VBoxServicePageSharing.cpp
 endif
+
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxService_SOURCES.win  = \
@@ -76 +85 @@
         VBoxServicePropCache.cpp
 endif
+
 if1of ($(KBUILD_TARGET), linux)
  VBoxService_SOURCES     += \
         VBoxServiceCpuHotPlug.cpp
 endif
+
+ifdef VBOX_WITH_SHARED_FOLDERS
+ if1of ($(KBUILD_TARGET), linux solaris)
+  VBoxService_SOURCES          += \
+        VBoxServiceAutoMount.cpp
+  VBoxService_SOURCES.linux    += \
+        ../../linux/sharedfolders/vbsfmount.c
+ endif
+endif
+
 VBoxService_SOURCES.win  += \
         VBoxService-win.rc \

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -104 +104 @@
 #ifdef VBOX_WITH_PAGE_SHARING
     { &g_PageSharing, NIL_RTTHREAD, false, false, false, true },
+#endif
+#ifdef VBOX_WITH_SHARED_FOLDERS
+    { &g_AutoMount, NIL_RTTHREAD, false, false, false, true },
 #endif
 };

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -250 +250 @@
 extern VBOXSERVICE  g_PageSharing;
 #endif
+#ifdef VBOX_WITH_SHARED_FOLDERS
+extern VBOXSERVICE  g_AutoMount;
+#endif
 
 extern RTEXITCODE   VBoxServiceSyntax(const char *pszFormat, ...);