Date: Thu, 22 Apr 2021 08:19:16 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8a311de0cb80 - main - emulators/virtualbox-ose-additions: Fix vboxvfs panic Message-ID: <202104220819.13M8JGIR061641@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a311de0cb804d8b135413884b4fb336d287ad5a commit 8a311de0cb804d8b135413884b4fb336d287ad5a Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2021-04-22 08:15:53 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2021-04-22 08:15:53 +0000 emulators/virtualbox-ose-additions: Fix vboxvfs panic Fix panic on mount when trying to use vbox VFS after base r355790 (or git commit hash 6fa079fc3f5e). PR: 255208 MFH: 2021Q2 --- emulators/virtualbox-ose-additions/Makefile | 1 + .../files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index e34b98c7a6c4..b335cda7154e 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -2,6 +2,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 6.1.18 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c index 471b3ac76714..99893d2f750e 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c @@ -1,6 +1,6 @@ --- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig 2021-01-07 15:34:22 UTC +++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c -@@ -14,228 +14,1347 @@ +@@ -14,228 +14,1350 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ @@ -160,6 +160,9 @@ + .vop_write = vboxfs_write, + .vop_bmap = VOP_EOPNOTSUPP }; ++#if __FreeBSD_version > 1300068 ++VFS_VOP_VECTOR_REGISTER(vboxfs_vnodeops); ++#endif -static int vboxvfs_access(struct vop_access_args *ap) +static uint64_t
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104220819.13M8JGIR061641>