Changeset 75677 in vbox

Timestamp:

Nov 22, 2018 9:30:17 PM (6 years ago)

Author:

vboxsync

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

126872

Message:

darwin/VBoxSF: Updates.

Location:

trunk/src/VBox/Additions/darwin/VBoxSF

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxSF-VNodeOps.cpp (modified) (2 diffs)
• VBoxSF-VfsOps.cpp (modified) (5 diffs)
• VBoxSF.cpp (modified) (2 diffs)
• VBoxSFInternal.h (modified) (5 diffs)

trunk/src/VBox/Additions/darwin/VBoxSF/Makefile.kmk

@@ -26 +26 @@
 VBoxSF_INST     = $(INST_ADDITIONS)VBoxSF.kext/Contents/MacOS/
 VBoxSF_DEFS     = VBOX_WITH_HGCM
-VBoxSF_CXXFLAGS = -Wno-unused -Wno-unused-parameter
 VBoxSF_LIBS     = $(VBOX_LIB_VBGL_R0)
 VBoxSF_SOURCES  = \

trunk/src/VBox/Additions/darwin/VBoxSF/VBoxSF-VNodeOps.cpp

@@ -676 +676 @@
 static int vboxSfDwnVnPathConf(struct vnop_pathconf_args *pArgs)
 {
-    PDEBUG("here");
+    Log(("vboxSfDwnVnPathConf:\n"));
+    RT_NOREF(pArgs);
     return 0;
 }
@@ -697 +698 @@
 
     /* Check that it's not a root node that's in use. */
-    PVBOXSFMNT pMntData = (PVBOXSFMNT)vfs_fsprivate(vnode_mount(pArgs->a_vp));
+    PVBOXSFMNTDATA pMntData = (PVBOXSFMNTDATA)vfs_fsprivate(vnode_mount(pArgs->a_vp));
     AssertReturn(!pMntData || pMntData->pVnRoot != pArgs->a_vp, EBUSY);
 

trunk/src/VBox/Additions/darwin/VBoxSF/VBoxSF-VfsOps.cpp

@@ -49 +49 @@
 static int vboxSfDwnVfsGetAttr(mount_t pMount, struct vfs_attr *pFsAttr, vfs_context_t pContext)
 {
-    PVBOXSFMNT pThis = (PVBOXSFMNT)vfs_fsprivate(pMount);
+    PVBOXSFMNTDATA pThis = (PVBOXSFMNTDATA)vfs_fsprivate(pMount);
     AssertReturn(pThis, EBADMSG);
     LogFlow(("vboxSfDwnVfsGetAttr: %s\n", pThis->MntInfo.szFolder));
@@ -371 +371 @@
 static int vboxSfDwnVfsRoot(mount_t pMount, vnode_t *ppVnode, vfs_context_t pContext)
 {
-    PVBOXSFMNT pThis = (PVBOXSFMNT)vfs_fsprivate(pMount);
+    PVBOXSFMNTDATA pThis = (PVBOXSFMNTDATA)vfs_fsprivate(pMount);
     AssertReturn(pThis, EBADMSG);
     LogFlow(("vboxSfDwnVfsRoot: pThis=%p:{%s}\n", pThis, pThis->MntInfo.szFolder));
+    RT_NOREF(pContext);
 
     /*
@@ -412 +413 @@
 static int vboxSfDwnVfsUnmount(mount_t pMount, int fFlags, vfs_context_t pContext)
 {
-    PVBOXSFMNT pThis = (PVBOXSFMNT)vfs_fsprivate(pMount);
+    PVBOXSFMNTDATA pThis = (PVBOXSFMNTDATA)vfs_fsprivate(pMount);
     AssertReturn(pThis, 0);
     LogFlowFunc(("pThis=%p:{%s} fFlags=%#x\n", pThis, pThis->MntInfo.szFolder, fFlags));
+    RT_NOREF(pContext);
 
     /*
@@ -490 +492 @@
 static int vboxSfDwnVfsMount(mount_t pMount, vnode_t pDevVp, user_addr_t pUserData, vfs_context_t pContext)
 {
-    RT_NOREF(pDevVp)
+    RT_NOREF(pDevVp, pContext);
 
     /*
@@ -511 +513 @@
      * Get the mount information from userland.
      */
-    PVBOXSFMNT pThis = (PVBOXSFMNT)RTMemAllocZ(sizeof(*pThis));
+    PVBOXSFMNTDATA pThis = (PVBOXSFMNTDATA)RTMemAllocZ(sizeof(*pThis));
     if (!pThis)
         return ENOMEM;

trunk/src/VBox/Additions/darwin/VBoxSF/VBoxSF.cpp

@@ -204 +204 @@
 static kern_return_t vboxSfDwnModuleUnload(struct kmod_info *pKModInfo, void *pvData)
 {
+    RT_NOREF(pKModInfo, pvData);
 #ifdef DEBUG
     printf("vboxSfDwnModuleUnload\n");
@@ -209 +210 @@
 #endif
 
+
     /*
      * Are we busy?  If so fail.

trunk/src/VBox/Additions/darwin/VBoxSF/VBoxSFInternal.h

@@ -50 +50 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
-/** @todo misguided, should use Log() and LogRel. sigh... */
-#define PINFO(fmt, args...)     printf(VBOXSF_DARWIN_FS_NAME ": INFO: " fmt "\n", ## args)
-#define PDEBUG(fmt, args...)    printf(VBOXSF_DARWIN_FS_NAME ": %s(): DEBUG: " fmt "\n", __FUNCTION__, ## args)
-#define PERROR(fmt, args...)    printf(VBOXSF_DARWIN_FS_NAME ": ERROR: " fmt "\n", ## args)
 
 
@@ -59 +55 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-/** Private data assigned to each mounted shared folder. Assigned to mp structure. */
-typedef struct vboxvfs_mount_data
+/**
+ * Private data we associate with a mount.
+ */
+typedef struct VBOXSFMNTDATA
 {
     /** The shared folder mapping */
@@ -70 +68 @@
     /** The mount info from the mount() call. */
     VBOXSFDRWNMOUNTINFO MntInfo;
-} vboxvfs_mount_t, VBOXSFMNT;
-typedef VBOXSFMNT *PVBOXSFMNT;
-
-/** Private data assigned to each vnode object. */
-typedef struct vboxvfs_vnode_data
+} VBOXSFMNTDATA;
+/** Pointer to private mount data.  */
+typedef VBOXSFMNTDATA *PVBOXSFMNTDATA;
+
+/**
+ * Private data we associate with a VNode.
+ */
+typedef struct VBOXSFDWNVNDATA
 {
     SHFLHANDLE      hHandle;                /** VBoxVFS object handle. */
@@ -80 +81 @@
     ///lck_attr_t     *pLockAttr;              /** BSD locking stuff */
     ///lck_rw_t       *pLock;                  /** BSD locking stuff */
-} vboxvfs_vnode_t, VBOXSFDWNVNDATA;
-/** Private vnode data. */
+} VBOXSFDWNVNDATA;
+/** Pointer to private vnode data. */
 typedef VBOXSFDWNVNDATA *PVBOXSFDWNVNDATA;
 
@@ -94 +95 @@
 extern struct vnodeopv_desc g_VBoxSfVnodeOpvDesc;
 extern int (**g_papfnVBoxVFSVnodeDirOpsVector)(void *);
+