Changeset 10023 in vbox for trunk

Timestamp:

Jun 30, 2008 3:21:25 PM (17 years ago)

Author:

vboxsync

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

32501

Message:

Solaris vboxvfs: resolved symbols and updated the VBOXGUESTR0 template. Added ConvertToErrno to GuestR0 IPRT.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/solaris/SharedFolders/Makefile.kmk (modified) (1 diff)
• src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c (modified) (8 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2760 +2760 @@
 TEMPLATE_VBOXGUESTR0_DEFS        = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0
 ifeq ($(KBUILD_TARGET),solaris) # No VBI for the guest additions yet.
- TEMPLATE_VBOXGUESTR0_LDFLAGS    = -r
+ TEMPLATE_VBOXGUESTR0_LDFLAGS    = -r -dy
 endif
 

trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk

@@ -34 +34 @@
         $(VBOX_LIB_VBGL_R0) \
         $(VBOX_LIB_IPRT_GUEST_R0)
+vboxvfs_LDFLAGS      += -N drv/vboxguest
 
 include $(KBUILD_PATH)/subfooter.kmk

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

@@ -25 +25 @@
 #include "vboxvfs.h"
 
+#if defined(DEBUG_ramshankar) && !defined(LOG_ENABLED)
+# define LOG_ENABLED
+# define LOG_TO_BACKDOOR
+#endif
 #include <VBox/log.h>
 #include <iprt/string.h>
 #include <iprt/mem.h>
+#include <iprt/err.h>
 
 
@@ -36 +41 @@
 #define DEVICE_NAME              "vboxvfs"
 /** The module description as seen in 'modinfo'. */
-#define DEVICE_DESC              "VirtualBox Shared Filesystem"
+#define DEVICE_DESC              "filesystem for VirtualBox Shared Folders"
 
 /** Mount Options */
@@ -149 +154 @@
 {
     LogFlow((DEVICE_NAME ":_init\n"));
+
     int rc = ddi_soft_state_init(&g_pVBoxVFSState, sizeof(vboxvfs_state_t), 1);
     if (!rc)
@@ -163 +169 @@
 {
     LogFlow((DEVICE_NAME ":_fini\n"));
+
     int rc = mod_remove(&g_VBoxVFSModLinkage);
     if (!rc)
@@ -173 +180 @@
 {
     LogFlow((DEVICE_NAME ":_info\n"));
+
     return mod_info(&g_VBoxVFSModLinkage, pModInfo);
 }
@@ -218 +226 @@
                         return 0;
                     }
+                    else
+                        LogRel((DEVICE_NAME ":vn_make_ops failed. rc=%d\n", rc));
                 }
                 else
@@ -246 +256 @@
 static int VBoxVFS_Mount(vfs_t *pVFS, vnode_t *pVNode, struct mounta *pMount, cred_t *pCred)
 {
-    int rc;
+    int rc = 0;
     int Uid = 0;
     int Gid = 0;
-    char *pszShare;
-    size_t cbShare;
+    char *pszShare = NULL;
+    size_t cbShare = NULL;
     pathname_t PathName;
-    vnode_t *pVNodeSpec;
-    vnode_t *pVNodeDev;
-    dev_t Dev;
+    vnode_t *pVNodeSpec = NULL;
+    vnode_t *pVNodeDev = NULL;
+    dev_t Dev = 0;
     SHFLSTRING *pShflShareName = NULL;
-    size_t cbShflShareName;
-    vboxvfs_globinfo_t *pVBoxVFSGlobalInfo;
+    size_t cbShflShareName = 0;
+    vboxvfs_globinfo_t *pVBoxVFSGlobalInfo = NULL;
     int AddrSpace = (pMount->flags & MS_SYSSPACE) ? UIO_SYSSPACE : UIO_USERSPACE;
 #if 0
@@ -363 +373 @@
             {
                 Dev = pVNodeSpec->v_rdev;
-                pszShare = RTStrDup(PathName.pn_path);
+                memcpy(pszShare, PathName.pn_path, strlen(PathName.pn_path));
                 cbShare = strlen(pszShare);
             }

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1170 +1170 @@
 RuntimeGuestR0_SOURCES.solaris = \
         common/err/RTErrConvertFromErrno.cpp \
+        common/err/RTErrConvertToErrno.cpp \
         common/misc/thread.cpp \
         common/string/memchr.asm \