VirtualBox

Changeset 10023

Show
Ignore:
Timestamp:
06/30/08 17:21:25 (3 months ago)
Author:
vboxsync
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Config.kmk

    r9954 r10023  
    27602760TEMPLATE_VBOXGUESTR0_DEFS        = $(TEMPLATE_VBOXR0DRV_DEFS) IN_GUEST IN_GUEST_R0 
    27612761ifeq ($(KBUILD_TARGET),solaris) # No VBI for the guest additions yet. 
    2762  TEMPLATE_VBOXGUESTR0_LDFLAGS    = -r 
     2762 TEMPLATE_VBOXGUESTR0_LDFLAGS    = -r -dy 
    27632763endif 
    27642764 
  • trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk

    r9175 r10023  
    3434        $(VBOX_LIB_VBGL_R0) \ 
    3535        $(VBOX_LIB_IPRT_GUEST_R0) 
     36vboxvfs_LDFLAGS      += -N drv/vboxguest 
    3637 
    3738include $(KBUILD_PATH)/subfooter.kmk 
  • trunk/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c

    r9673 r10023  
    2525#include "vboxvfs.h" 
    2626 
     27#if defined(DEBUG_ramshankar) && !defined(LOG_ENABLED) 
     28# define LOG_ENABLED 
     29# define LOG_TO_BACKDOOR 
     30#endif 
    2731#include <VBox/log.h> 
    2832#include <iprt/string.h> 
    2933#include <iprt/mem.h> 
     34#include <iprt/err.h> 
    3035 
    3136 
     
    3641#define DEVICE_NAME              "vboxvfs" 
    3742/** The module description as seen in 'modinfo'. */ 
    38 #define DEVICE_DESC              "VirtualBox Shared Filesystem
     43#define DEVICE_DESC              "filesystem for VirtualBox Shared Folders
    3944 
    4045/** Mount Options */ 
     
    149154{ 
    150155    LogFlow((DEVICE_NAME ":_init\n")); 
     156 
    151157    int rc = ddi_soft_state_init(&g_pVBoxVFSState, sizeof(vboxvfs_state_t), 1); 
    152158    if (!rc) 
     
    163169{ 
    164170    LogFlow((DEVICE_NAME ":_fini\n")); 
     171 
    165172    int rc = mod_remove(&g_VBoxVFSModLinkage); 
    166173    if (!rc) 
     
    173180{ 
    174181    LogFlow((DEVICE_NAME ":_info\n")); 
     182 
    175183    return mod_info(&g_VBoxVFSModLinkage, pModInfo); 
    176184} 
     
    218226                        return 0; 
    219227                    } 
     228                    else 
     229                        LogRel((DEVICE_NAME ":vn_make_ops failed. rc=%d\n", rc)); 
    220230                } 
    221231                else 
     
    246256static int VBoxVFS_Mount(vfs_t *pVFS, vnode_t *pVNode, struct mounta *pMount, cred_t *pCred) 
    247257{ 
    248     int rc
     258    int rc = 0
    249259    int Uid = 0; 
    250260    int Gid = 0; 
    251     char *pszShare
    252     size_t cbShare
     261    char *pszShare = NULL
     262    size_t cbShare = NULL
    253263    pathname_t PathName; 
    254     vnode_t *pVNodeSpec
    255     vnode_t *pVNodeDev
    256     dev_t Dev
     264    vnode_t *pVNodeSpec = NULL
     265    vnode_t *pVNodeDev = NULL
     266    dev_t Dev = 0
    257267    SHFLSTRING *pShflShareName = NULL; 
    258     size_t cbShflShareName
    259     vboxvfs_globinfo_t *pVBoxVFSGlobalInfo
     268    size_t cbShflShareName = 0
     269    vboxvfs_globinfo_t *pVBoxVFSGlobalInfo = NULL
    260270    int AddrSpace = (pMount->flags & MS_SYSSPACE) ? UIO_SYSSPACE : UIO_USERSPACE; 
    261271#if 0 
     
    363373            { 
    364374                Dev = pVNodeSpec->v_rdev; 
    365                 pszShare = RTStrDup(PathName.pn_path); 
     375                memcpy(pszShare, PathName.pn_path, strlen(PathName.pn_path)); 
    366376                cbShare = strlen(pszShare); 
    367377            } 
  • trunk/src/VBox/Runtime/Makefile.kmk

    r9839 r10023  
    11701170RuntimeGuestR0_SOURCES.solaris = \ 
    11711171        common/err/RTErrConvertFromErrno.cpp \ 
     1172        common/err/RTErrConvertToErrno.cpp \ 
    11721173        common/misc/thread.cpp \ 
    11731174        common/string/memchr.asm \ 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy