From nobody Sat Jul 20 09:38:59 2024 X-Original-To: dev-commits-ports-all@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 4WR1hN186tz5RLG2; Sat, 20 Jul 2024 09:39:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WR1hM6Fcjz4n6n; Sat, 20 Jul 2024 09:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721468339; 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=8lDJn/sO+6crVVAbpIMtn+jFxoZWUMjimRs6R76ctjw=; b=FvUbs/iYSHailaoRFFwKhCkSS6MtaTGUv7iNkWKSc/V681leiMFS9n5qeKhTyZtwslZHCA 8ek8cXVPE4DicMoQbC8Z1W33FVOBWVXcBlaRpf9vpdIiTAMMEhB+zAltZ/w8MmrjjS9p/o FQxwW6gIGaDZ3RzqBX+wq+54q74nOzju3eFIxVAFpe+Ts5fddGxAM+Ipn/ogxZUnLCkWe4 Qw8bv3kfENZtljMMP4Mttqzg4aKs8Q0YgQbyvmQcREeXVmNSOWT4/sUiBb5OhhplfNJiuj hU8B5aHRehaXUgdaLtAOivrgw6H/qVZgzswrKYU3ZmcAQT088Ezl/S90ZYG6Jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721468339; a=rsa-sha256; cv=none; b=mItX5pHwQiu7RhpJqVKUdXWUy0RmVbI8+V1WGQNSVvBLD1YkkAdVCzwRg4O/JU/YmF5/MR 4r2NgY70KS2Tes3EuXBGwkPeD/jCjHvH83IGBQ+mbqBPNmuiNOr87wmL2GuArbyj5fpLqi 6rgGuemNcKzzT1TJVkKY7TW1fTBrs/bT4fLPdczmpUMBc6GVGW83mbampkbNsvzhF4AJDi nWAyHMoIJJ0GMqDvYnaE7sf8pre91c//CJmG3HOPqWrZakcfVeGU6QTo0Y3HT7e+zkoeNA KUz4uSqAPbmuKcnAgQyCB6kJ1TaDV6gpDXWG6Dw4Rr2TFJnKrK3mcMeKqMSfUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721468339; 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=8lDJn/sO+6crVVAbpIMtn+jFxoZWUMjimRs6R76ctjw=; b=MpsEXjlp4+p7UJq4zLJIb/A3pEZPqMOxE+9Xk9dvfDr+l4LqgKfxPJ1u+eIDnQPrW+JWV1 EDv5AIAHh2WewTo/jD55dDCGrBFSOGZ8q6VhvEO0/UxWoBqTJyOUXbQhASQf+3iNXklvmM QXYXw4NG8wT+kwPQ2PUdvhwHOjWHLB6/RqKzTSK7cCqU7vwGUfrFq7eOAW0jFQiHmntrN0 w6FYXkYW2a7qjRWx/FdRCUF/nAYGYzwH+px+MTn0NUQqY05H9frWHIfsxkCwSmWKINJ36A WnWtHukx1HWWKa++lcq6bvOy5N7i3kYFOOCiQAws7xcNzYM45/z9yn/8gycc+Q== 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 4WR1hM56jQz1BFd; Sat, 20 Jul 2024 09:38:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46K9cx2v004156; Sat, 20 Jul 2024 09:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46K9cxbu004153; Sat, 20 Jul 2024 09:38:59 GMT (envelope-from git) Date: Sat, 20 Jul 2024 09:38:59 GMT Message-Id: <202407200938.46K9cxbu004153@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 873b08a9cff1 - 2024Q3 - emulators/virtualbox-ose{,-nox11}-legacy: fix USB passthrough fails with: Failed to create a proxy device for the USB device List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 873b08a9cff17f72029df8a6464855b631f16316 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=873b08a9cff17f72029df8a6464855b631f16316 commit 873b08a9cff17f72029df8a6464855b631f16316 Author: Igor Malyshev AuthorDate: 2024-07-20 09:31:14 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-20 09:38:47 +0000 emulators/virtualbox-ose{,-nox11}-legacy: fix USB passthrough fails with: Failed to create a proxy device for the USB device Failed to create a proxy device for the USB device. (Error: VERR_INVALID_PARAMETER) 00:00:24.961804 usbProxyConstruct: Failed to open '/dev/ugen0.6', rc=VERR_INVALID_PARAMETER 00:00:24.961881 ERROR [COM]: aRC=NS_ERROR_FAILURE (0x80004005) aIID={872da645-4a9b-1727-bee2-5585105b9eed} aComponent={ConsoleWrap} aText={Failed to create a proxy device for the USB device. (Error: VERR_INVALID_PARAMETER)}, preserve=false aResultDetail=-2 In commit https://cgit.freebsd.org/src/commit/?id=9b077d72bcc313baea2b9283afc7f568739eaadc +#define USB_FS_XFER_MAX 126 - if (fs_ep_ptr == NULL || ep_index_max > 127) + if (fs_ep_ptr == NULL || ep_index_max > USB_FS_XFER_MAX) To fix VirtualBox decrease USBFBSD_MAXENDPOINTS from 127 to 126: -#define USBFBSD_MAXENDPOINTS 127 +#define USBFBSD_MAXENDPOINTS 126 PR: 270900 Tested by: groenveld@acm.org, russo@bogodyn.org Approved by: with hat of vbox (maintainer) MFH: 2024Q3 (cherry picked from commit 4b9b21dfcdc6a213b8b9842dbc7ea8dd8fcd48e3) --- emulators/virtualbox-ose-legacy/Makefile | 2 +- .../patch-src_VBox_Devices_USB_USBProxyDevice-freebsd.cpp | 11 +++++++++++ emulators/virtualbox-ose-nox11-legacy/Makefile | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 4ce61c2bb073..659e3ecdce3a 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.44 -PORTREVISION?= 20 +PORTREVISION?= 21 CATEGORIES= emulators MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/:src \ LOCAL/bofh/emulators/virtualbox-ose-legacy:docs diff --git a/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Devices_USB_USBProxyDevice-freebsd.cpp b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Devices_USB_USBProxyDevice-freebsd.cpp new file mode 100644 index 000000000000..8ece9c316a1e --- /dev/null +++ b/emulators/virtualbox-ose-legacy/files/patch-src_VBox_Devices_USB_USBProxyDevice-freebsd.cpp @@ -0,0 +1,11 @@ +--- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig 2020-07-09 16:55:58 UTC ++++ src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp +@@ -57,7 +57,7 @@ + #include "../USBProxyDevice.h" + + /** Maximum endpoints supported. */ +-#define USBFBSD_MAXENDPOINTS 127 ++#define USBFBSD_MAXENDPOINTS 126 + #define USBFBSD_MAXFRAMES 56 + + /** This really needs to be defined in vusb.h! */ diff --git a/emulators/virtualbox-ose-nox11-legacy/Makefile b/emulators/virtualbox-ose-nox11-legacy/Makefile index 0406eecfc7aa..f5b76395f8e9 100644 --- a/emulators/virtualbox-ose-nox11-legacy/Makefile +++ b/emulators/virtualbox-ose-nox11-legacy/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 18 +PORTREVISION= 19 PKGNAMESUFFIX= -nox11-legacy OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO