From nobody Sat Jul 20 09:38:58 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 4WR1hM12pNz5RLQL; Sat, 20 Jul 2024 09:38:59 +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 4WR1hL59tyz4n4c; Sat, 20 Jul 2024 09:38:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721468338; 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=RdcPlSVHEBznRsYcheX35KZuryJixc0AtPyvOO055tQ=; b=Q/usYIGOlMKnDfhy/Tp9NMrEOwbpVhtOoDagQQ6moMWmjUrjaobb+AcwkJ2TWUfxWrJ36R FN3Olvw61o0FN+3hIDFWHeJDv282GLaYskDmFGd/gA3LEc16Z1c4PFIZ8aNIq2wHP7Qw/R OAkyMhuxsA++f43cvZUyZuAAP2d593BmMapMUKJq+Atk7b194+H0FiYKXSGmYbZGqqwFQ2 Uc/yVLpSqUz+f0dRbkOc66GyYmesbysNsohDYSCaN1u0vxC2wcGvjGoCLU2nXxIB8kxeDi I/1CGH91OMJ2OIHHgceBK58WUYF/Lmmuh6OuD83gm7hSF+aXJF6Iwgd1VnltWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721468338; a=rsa-sha256; cv=none; b=Bx9mWjOhz6nXIlbefmMCdp9Bmp8QyV6scLC0vH0sqOSmmbJX3RRyje6pCe8lyHHT82s7l9 4sXVtEG+JDgh07dSUxDrRqYPRivTNmOlup1O38mBGZRb6CbJ1hG/iD3NJGb9aGLt5uCXM3 uoP0dht3f1hfTT7q96S38LxbB1YiKmENh2JSKGVfi949WjI5NNmeRKI99F+rIZIGZRRW/x ck73RUmgvGld6Co5DtPQzj+LrpModVGEAnNjSs1rW4tD7vvNG7g+CTYPUtsNxQx6FkqXop 8Ye76ViRxSzwPCP9Hc5piNnFquUJS0Ua9c1gR0Z1v6Mnz3l7KNO5c2W/S4xu3A== 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=1721468338; 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=RdcPlSVHEBznRsYcheX35KZuryJixc0AtPyvOO055tQ=; b=hcYlkuiFE4J+sz/jPwP65OCN0F2ZFYDzL6u414uO7hBCFODgZfMdby+/HQfdrAjRzHcfRR U3rkMaVNArJK+yUi1jCckZE4MA7wEVZil1UtDdmpZkfJX1LnuL8xkTh5+NSEqziZl83/kO SrEoxVFIR3bTb42NxHbt1IytXBwuTTEGDwjEKFtMOCEvFJaC6sJrzKNk4mvTUgcDkH5xeF cfVPmuFT3AJlbWwkBHFTWVxBrWwUgd2FHRZEk4JLpc4TDvtutjDcJ1m1CLvZaQ84/wOINR vyfwJY/spYiEO7joznuc+gEwBUTLMqL22umugRsDAI5TAB/+Y/NRVb/i8dYTLA== 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 4WR1hL3fTRz19G8; Sat, 20 Jul 2024 09:38:58 +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 46K9cwW8004080; Sat, 20 Jul 2024 09:38:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46K9cwkm004077; Sat, 20 Jul 2024 09:38:58 GMT (envelope-from git) Date: Sat, 20 Jul 2024 09:38:58 GMT Message-Id: <202407200938.46K9cwkm004077@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: 1a6d06fb4120 - 2024Q3 - emulators/virtualbox-ose{,-nox11}: 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: 1a6d06fb4120fc253a48b3b95342748ddd2a651f Auto-Submitted: auto-generated The branch 2024Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a6d06fb4120fc253a48b3b95342748ddd2a651f commit 1a6d06fb4120fc253a48b3b95342748ddd2a651f Author: Igor Malyshev AuthorDate: 2024-07-20 09:19:29 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-20 09:38:25 +0000 emulators/virtualbox-ose{,-nox11}: 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 fb231153bf5b66737effcc6b2ca22296893d7510) --- emulators/virtualbox-ose-nox11/Makefile | 2 +- emulators/virtualbox-ose/Makefile | 2 +- .../patch-src_VBox_Devices_USB_USBProxyDevice-freebsd.cpp | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/emulators/virtualbox-ose-nox11/Makefile b/emulators/virtualbox-ose-nox11/Makefile index d2db9016af94..285b8931e189 100644 --- a/emulators/virtualbox-ose-nox11/Makefile +++ b/emulators/virtualbox-ose-nox11/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -nox11 OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \ diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 93cbd55a9d84..b60eff81cff8 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose PORTVERSION= 6.1.50 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/:src \ LOCAL/bofh/emulators/virtualbox-ose:docs diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_USB_USBProxyDevice-freebsd.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_USB_USBProxyDevice-freebsd.cpp new file mode 100644 index 000000000000..045e328d5c48 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_USB_USBProxyDevice-freebsd.cpp @@ -0,0 +1,11 @@ +--- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig 2024-01-11 12:23:15 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! */