View | Details | Raw Unified | Return to bug 272991 | Differences between
and this patch

Collapse All | Expand All

(-)b/emulators/virtualbox-ose-additions/Makefile (+2 lines)
Lines 99-104 post-patch: Link Here
99 
	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \
 99 
	@${ECHO_CMD} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \
100 
	    ${WRKSRC}/LocalConfig.kmk
 100 
	    ${WRKSRC}/LocalConfig.kmk
101 
	@${ECHO_CMD} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
 101 
	@${ECHO_CMD} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
102 
	@${ECHO_CMD} 'CXXDEFS += _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR' >> \
103 
	    ${WRKSRC}/LocalConfig.kmk
102 
.if ${COMPILER_TYPE} == clang
 104 
.if ${COMPILER_TYPE} == clang
103 
	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 105 
	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
104 
	    -e 's| -fno-merge-constants||' \
 106 
	    -e 's| -fno-merge-constants||' \
(-)b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs.h (-2 / +8 lines)
Lines 9-15 Link Here
9 
 /*
 9 
 /*
10 
  * Copyright (C) 2010-2020 Oracle Corporation
 10 
  * Copyright (C) 2010-2020 Oracle Corporation
11 
  *
 11 
  *
12 
@@ -24,72 +19,371 @@
 12 
@@ -24,72 +19,377 @@
13 
 #define VBOXVFS_VFSNAME "vboxvfs"
 13 
 #define VBOXVFS_VFSNAME "vboxvfs"
14 
 #define VBOXVFS_VERSION 1
 14 
 #define VBOXVFS_VERSION 1
15
15
Lines 134-139 Link Here
134 
-    int             didrele;
 134 
-    int             didrele;
135 
+#include <VBox/VBoxGuestLibSharedFolders.h>
 135 
+#include <VBox/VBoxGuestLibSharedFolders.h>
136 
+
 136 
+
137 
+#if __FreeBSD_version >= 1400093
138 
+typedef __enum_uint8(vtype) enum_vtype_t;
139 
+#else
140 
+typedef enum vtype enum_vtype_t;
141 
+#endif
142 
+
137 
+#define	VBOXVFS_DEBUG(lvl, ...)	do {					\
 143 
+#define	VBOXVFS_DEBUG(lvl, ...)	do {					\
138 
+	if (vboxvfs_debug >= (lvl)) {					\
 144 
+	if (vboxvfs_debug >= (lvl)) {					\
139 
+		printf("VBOXVFS[%u]: ", lvl);				\
 145 
+		printf("VBOXVFS[%u]: ", lvl);				\
Lines 323-329 Link Here
323 
+void vboxfs_free_vp(struct vnode *);
 329 
+void vboxfs_free_vp(struct vnode *);
324 
+
 330 
+
325 
+int vboxfs_alloc_node(struct mount *, struct vboxfs_mnt *, const char*,
 331 
+int vboxfs_alloc_node(struct mount *, struct vboxfs_mnt *, const char*,
326 
+    enum vtype, uid_t, gid_t, mode_t, struct vboxfs_node *,
 332 
+    enum_vtype_t, uid_t, gid_t, mode_t, struct vboxfs_node *,
327 
+    struct vboxfs_node **);
 333 
+    struct vboxfs_node **);
328 
+void vboxfs_free_node(struct vboxfs_mnt *, struct vboxfs_node *);
 334 
+void vboxfs_free_node(struct vboxfs_mnt *, struct vboxfs_node *);
329 
+
 335 
+
(-)b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c (-1 / +1 lines)
Lines 130-136 Link Here
130 
+ */
 130 
+ */
131 
+int
 131 
+int
132 
+vboxfs_alloc_node(struct mount *mp, struct vboxfs_mnt *vsfmp, const char *fullpath,
 132 
+vboxfs_alloc_node(struct mount *mp, struct vboxfs_mnt *vsfmp, const char *fullpath,
133 
+    enum vtype type, uid_t uid, gid_t gid, mode_t mode, struct vboxfs_node *parent,
 133 
+    enum_vtype_t type, uid_t uid, gid_t gid, mode_t mode, struct vboxfs_node *parent,
134 
+    struct vboxfs_node **node)
 134 
+    struct vboxfs_node **node)
135 
 {
 135 
 {
136 
-    struct vboxvfs_mount_info args;
 136 
-    struct vboxvfs_mount_info args;
(-)b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c (-2 / +1 lines)
Lines 420-426 Link Here
420 
+ */
 420 
+ */
421 
+static int
 421 
+static int
422 
+vboxfs_alloc_file(struct vboxfs_mnt *vboxfsmp, const char *fullpath,
 422 
+vboxfs_alloc_file(struct vboxfs_mnt *vboxfsmp, const char *fullpath,
423 
+    enum vtype type, mode_t mode, struct vboxfs_node *parent,
 423 
+    enum_vtype_t type, mode_t mode, struct vboxfs_node *parent,
424 
+    int lkflag, struct vnode **vpp)
 424 
+    int lkflag, struct vnode **vpp)
425 
 {
 425 
 {
426 
-    return 0;
 426 
-    return 0;
427 
-

Return to bug 272991