From nobody Mon Aug 22 18:15:28 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 4MBLBT0zd0z4ZJlB; Mon, 22 Aug 2022 18:15:29 +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 4MBLBT0Fwrz3ZD8; Mon, 22 Aug 2022 18:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661192129; 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=QQ0lYFpDxQCi/PN8lzV6x1XB84uYWZeNbSGY3lRdpGA=; b=ZkJel4izC70Lk2Ne4XZ9RNKo6f0LkYJenufyyw4hetRPWHuzgwnm2WiydQeLKkZdhrbaHg +PswqivunnDdiybBOXTFYJ1/hl8ZZjX+Ty1w5F3KvqaVFHKDbHVbTjrr/EQ05iDiipO5F2 VH2ODgUY1beUcsk5f1YgopG2ZfdMYG2zipfT9SdlLREEY4HYqgoqd0ULvhaIDGlmY28ETY A9eAwnDC2H+DVBqn9VW2OxZFbi6nLoKSaV2vqtQxaOy62R0nou9MTf2EjBTY2cZIXlpOHa zA3Ruj5AV+Fp3tdBpIkyokXCeTo7Fsf2peu4081/cQGI5YmEApPWRd3Hm460hQ== 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 4MBLBS6H9Sz10HH; Mon, 22 Aug 2022 18:15:28 +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 27MIFSV3011342; Mon, 22 Aug 2022 18:15:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MIFSMr011341; Mon, 22 Aug 2022 18:15:28 GMT (envelope-from git) Date: Mon, 22 Aug 2022 18:15:28 GMT Message-Id: <202208221815.27MIFSMr011341@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: b1d42f867ccf - main - emulators/virtualbox-ose-additions-legacy: 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: b1d42f867ccfa21cfa602fce2d5b3a811744149d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661192129; 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=QQ0lYFpDxQCi/PN8lzV6x1XB84uYWZeNbSGY3lRdpGA=; b=d9GS2rWmfoirRWDAkXrXCYbFSKYWLLNAoc8k3w0YXtLlxFed+g4rS+spfe8Zi4OqngurNg iqeo0wOhyYC5as4p+yJF6SwkvH61UfVhtgPRx26yCHZShrW0hDzA6wLp8HFeRnn842dVZK 61vZkxM73zMt//QotukwTNpbg3wfpstu8fo2hVs+xfiY3a5z+bBoWkzfIANEUM35BiL98r XvePUPH9xEIxTvmCvgy3HDwxgSSBnq2VvYO3QyUDXTmW9CSQsU/24rO+AWA5GutFRBhmxl GxoAwOsbCfPGKebRCqMOVagsOdFteZwWcptQLJus1iXm98tQti1pm2UgH1dHHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661192129; a=rsa-sha256; cv=none; b=DeckVk0PCMsriR8hzhZAPhL3h9SbLsGiCip7ZS2GotHzmVgzPsUDat8kEAUP7nY9asE+8u oq0v0Qn8jibqpN1+aiOHJFnrne/RwA8Sqc3fsG+QOcznzz9Jc5sDftjqiHjMt17p9h/oPx vgJtQSNqV2vXTErDj/9nLQSTerFe1tY0BJpmJPYNBpBKGrN8Z2ne+U24nGly6KeUhA+Hgu 98wVvJteiAFMtvjKotvvCgJ/jOuqlRcMa5+fnDfRQouxkmbhJhof66Vehj25gSABtXzAoH onkAu/AqMkDPMXbNVavlzqFNxLSByBZ19JiABglwBXTGtTQnqKgUyWdY9+OLlg== 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=b1d42f867ccfa21cfa602fce2d5b3a811744149d commit b1d42f867ccfa21cfa602fce2d5b3a811744149d Author: John Baldwin AuthorDate: 2022-08-22 18:14:28 +0000 Commit: John Baldwin CommitDate: 2022-08-22 18:14:28 +0000 emulators/virtualbox-ose-additions-legacy: Remove devclass from DRIVER_MODULE on recent main. Reviewed by: madpilot Differential Revision: https://reviews.freebsd.org/D35953 --- ...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-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c index c6eda2f9587d..931ff7e48f21 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c @@ -1,4 +1,4 @@ ---- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2020-05-13 19:37:01 UTC +--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2020-07-09 16:50:06 UTC +++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c @@ -102,8 +102,6 @@ struct VBoxGuestDeviceState struct resource *pIrqRes; @@ -184,7 +184,7 @@ * I/O control request. * * @returns depends... -@@ -301,8 +210,12 @@ static int vgdrvFreeBSDClose(struct cdev *pDev, int fF +@@ -301,8 +210,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; @@ -198,7 +198,7 @@ /* * Deal with the fast ioctl path first. */ -@@ -497,12 +410,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t u +@@ -497,12 +410,14 @@ static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEv static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEvents, struct thread *td) { @@ -257,3 +257,16 @@ vgdrvFreeBSDRemoveIRQ(pDevice, pState); } else +@@ -753,8 +668,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-legacy/files/patch-src_VBox_Additions_freebsd_drm_vboxvideo__drm.c b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Additions_freebsd_drm_vboxvideo__drm.c new file mode 100644 index 000000000000..95298253e34f --- /dev/null +++ b/emulators/virtualbox-ose-legacy/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 17:36:57 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);