From nobody Mon Aug 22 18:15:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MBLBV24d8z4ZJtM; Mon, 22 Aug 2022 18:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MBLBV1gDXz3ZTk; Mon, 22 Aug 2022 18:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661192130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/BImh2a9WgykPzlGeFhv/UMDJRMKLw6v/Axa8j7ncjE=; b=W5m+9i+q/lFfCw9caQ2p8pUHIgyPxvn4jXWfGLUGLWEYfH6EBfhxVlEgQJ7p8NU1eEtJcD WmPphJBpW55KI5fojn/yc+XA3Zv470/OtCHxOdWHU6/nUcyo6u20i4SxwILu2QlntTaqAE JUul8S4aRZBrmhFnVIp6luAxxmyGX3+bQC1OmwHo8GRV15DmMnEG+4cssCeG2sc18TrEdw vgobkWQnfvr5f0Hbkn6jeW7KoTboaZmwxhZc9GDgSiaArv9lTFZ35zWEoOx5fCKvcOj6Nr vq7dohKTEqUE8YmBsTUAtCFPQ7Zj5eQ7tQ4kgWVX7hy3SvyuTZ8NuQqiToGwJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MBLBV0CyRz10Tt; Mon, 22 Aug 2022 18:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27MIFTfa011367; Mon, 22 Aug 2022 18:15:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MIFTk7011366; Mon, 22 Aug 2022 18:15:29 GMT (envelope-from git) Date: Mon, 22 Aug 2022 18:15:29 GMT Message-Id: <202208221815.27MIFTk7011366@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 8b07c8afd6ff - main - emulators/virtualbox-ose-additions: Remove devclass from DRIVER_MODULE on recent main. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b07c8afd6ff3bedf0d82ee1d7de17a2ec261866 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661192130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/BImh2a9WgykPzlGeFhv/UMDJRMKLw6v/Axa8j7ncjE=; b=ZQzi+jeO4k6R/JeoMYlLX4ryQlgOZ8LxDQkJ/jATQ6DLd2aOwi1JP/NJZcIUWK36R49XEO 7ujQHHnesqzgEhKJgxqXpSC0cECFKN6vC01YhSTpOtKLHnUL7vw5WRWye9XVyZOHCB24Lu r1+hnKbMKwE9f5g9OUou3str5An4H6VZpE8Mv9amz781OtVmsfKGqFPbeekMdsOINotE4I +IuRDawTYyXkjzPMfp4x7I+e769vtbczzIvp21c8waThkZc9BdS3qKe1y9trpiQ+Geq6t8 JaZpBb2vlgDjHB4yQ2EzyJEPcB0T1EHSd9F0r42oLlLpLKWNJw1axn+XgLlCRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661192130; a=rsa-sha256; cv=none; b=bAcHxL/Q7W10uFghGVivPjupAIrXCOGuRpjULwMEX6NvMGJBhpMbIlpsgwybSjfaQLgApm 1rccBjX67ws5+OpkrP3nly9yGxxy5DxrupCFnCPgkG0a0/E1FIR3apxlNaPiFIDHqE9jzR /AYgS7utz/qUfEf9W/ZQh9Q7kPvFa6He7IphcaIHskI4+dfy+PCLKw/GnJ7hM8GUMQ8cuu 2rAi+7O+Ken7SB72VsTG/zjj6ZLPoCsTUMUUeeyl82euTmhIJJeeF6M2prUMy/t31xZDbj SCeUSInsmKwFv8fzeY9uk2eBZy5z5mTYm0B9E3USRr3Nh52ekGR2DuBJRMtRUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=8b07c8afd6ff3bedf0d82ee1d7de17a2ec261866 commit 8b07c8afd6ff3bedf0d82ee1d7de17a2ec261866 Author: John Baldwin AuthorDate: 2022-08-22 18:14:48 +0000 Commit: John Baldwin CommitDate: 2022-08-22 18:14:48 +0000 emulators/virtualbox-ose-additions: Remove devclass from DRIVER_MODULE on recent main. Reviewed by: madpilot Differential Revision: https://reviews.freebsd.org/D35954 --- ...Box-Additions-common-VBoxGuest-VBoxGuest-freebsd.c | 19 ++++++++++++++++--- ...ch-src_VBox_Additions_freebsd_drm_vboxvideo__drm.c | 17 +++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c index 3e664127c272..8fd24bda91f1 100644 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c @@ -1,4 +1,4 @@ ---- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2019-01-25 18:12:28 UTC +--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2022-03-22 23:37:46 UTC +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c @@ -45,6 +45,7 @@ #include @@ -202,7 +202,7 @@ * I/O control request. * * @returns depends... -@@ -316,8 +227,12 @@ static int vgdrvFreeBSDClose(struct cdev *pDev, int fF +@@ -316,8 +227,12 @@ static int vgdrvFreeBSDIOCtl(struct cdev *pDev, u_long static int vgdrvFreeBSDIOCtl(struct cdev *pDev, u_long ulCmd, caddr_t pvData, int fFile, struct thread *pTd) { PVBOXGUESTSESSION pSession; @@ -216,7 +216,7 @@ /* * Deal with the fast ioctl path first. */ -@@ -512,12 +427,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t u +@@ -512,12 +427,14 @@ static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEv static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEvents, struct thread *td) { @@ -275,3 +275,16 @@ vgdrvFreeBSDRemoveIRQ(pDevice, pState); } else +@@ -782,8 +699,12 @@ static driver_t vgdrvFreeBSDDriver = + sizeof(struct VBoxGuestDeviceState), + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(vboxguest, pci, vgdrvFreeBSDDriver, 0, 0); ++#else + static devclass_t vgdrvFreeBSDClass; + + DRIVER_MODULE(vboxguest, pci, vgdrvFreeBSDDriver, vgdrvFreeBSDClass, 0, 0); ++#endif + MODULE_VERSION(vboxguest, 1); + diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_drm_vboxvideo__drm.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_drm_vboxvideo__drm.c new file mode 100644 index 000000000000..d4e5f3fc5a33 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_drm_vboxvideo__drm.c @@ -0,0 +1,17 @@ +--- src/VBox/Additions/freebsd/drm/vboxvideo_drm.c.orig 2022-07-26 18:05:21 UTC ++++ src/VBox/Additions/freebsd/drm/vboxvideo_drm.c +@@ -154,10 +154,14 @@ static driver_t vboxvideo_driver = { + sizeof(struct drm_device) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(vboxvideo, vgapci, vboxvideo_driver, 0, 0); ++#else + extern devclass_t drm_devclass; + #if __FreeBSD_version >= 700010 + DRIVER_MODULE(vboxvideo, vgapci, vboxvideo_driver, drm_devclass, 0, 0); + #else + DRIVER_MODULE(vboxvideo, pci, vboxvideo_driver, drm_devclass, 0, 0); ++#endif + #endif + MODULE_DEPEND(vboxvideo, drm, 1, 1, 1);