From nobody Sat Jul 20 09:35:52 2024 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 4WR1cm3hbhz5RLKN; Sat, 20 Jul 2024 09:35:52 +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 4WR1cm2w7Qz4mQL; Sat, 20 Jul 2024 09:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721468152; 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=dWzked9+8j2kkIQE6AhbQLJR7Oxfn9asCWzEFckjYKo=; b=OEyOcRXRKZuXDYHkOqkYUGy56/NiJo3C6t/Zu07jAMV1IU96th3dwgqm/jQgoaucbiY9l8 OlZUD7QWRzq/4jmhXSE4f6KU6K6ZsAj66Xta10l7OcUzyF62wOrKejIo2RVUliqhJpXiy1 MJL1nA7sCOu3cu7cvj0qOE+E/H+K9ibSrOmECvqzjwdHhDlY3JdMD6/SaRHDAykCiYWxuX UwTG8eTMIxLFk8OBhIJHPgevNAaSZbZ41k30tFTGJDpCtIeG9O7k67PL0nwwKJf6B+cRO8 h9ntcdinE+aqan3lWd/zgEz2/c6rpvC8C1iGy9JJHrJk/AI1Ce8zPcOmd74OxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721468152; a=rsa-sha256; cv=none; b=bvlBOvXefG7iqgPDun7xjSrgyNkjqTyKr+ZMbc0xexJLdqSsYop8nOb7rbHQQuddO7LFHo cdu7U3IezC9poa5pEQZ63t2bkWHu5rolssV3wOPQBquH/BCyZcRN1kuhVBOAJclvzfqDDh GehXNT7YqIbNJI368jfdOfciGERMx50dntC0y/go61Ffa9OplTkmbO0dAa1U365PMv35XM wUFe+oQCs0RQ+4tf/SUI8aY1yCszgeeV6+m0nbN3zE9qTxZwfZ3K4A7oHU/aov53a3XS3r M5dpl1a/dWvph+Jtk4KrLli7ldmZousJgM+I8rXA0slYJW9dNMZE1eceLfcFbg== 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=1721468152; 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=dWzked9+8j2kkIQE6AhbQLJR7Oxfn9asCWzEFckjYKo=; b=nVZzL+blRei0TLDTyVdw5F1i5c/J9NSCOiGcxlHwx0b7Sh2rGV8XMCXKyJqtjOpwY9S4ut A2MawGhSo9XaPCHIiBGe7ILKiJTJ80mKmi5EA2Sm6tfi9CLxq/2f7PCpkbM2vD0aZJbXQM MwIMAwl6TdHpN3RYe4jhh8ErDFmJDh6ctxXAznglhFVCs0+k0yA/V/4USbUQAJNubtEPJD AKJpoB+KRyGWJeUJ/wbfi4abWxXdDWDxclBIPs8PQ6enTHPCNRFCkHEhtBaAqgaVcvurC2 hhMCQdtCqE7lyS26EJoMlvAXa4v7U3B2nQsfIzjUCO8INxMJ3H7oDdlcE/4itA== 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 4WR1cm2T5Wz19gY; Sat, 20 Jul 2024 09:35:52 +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 46K9Zqki003250; Sat, 20 Jul 2024 09:35:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46K9ZqaN003247; Sat, 20 Jul 2024 09:35:52 GMT (envelope-from git) Date: Sat, 20 Jul 2024 09:35:52 GMT Message-Id: <202407200935.46K9ZqaN003247@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: fb231153bf5b - main - emulators/virtualbox-ose{,-nox11}: fix USB passthrough fails with: Failed to create a proxy device for the USB device 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: fb231153bf5b66737effcc6b2ca22296893d7510 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb231153bf5b66737effcc6b2ca22296893d7510 commit fb231153bf5b66737effcc6b2ca22296893d7510 Author: Igor Malyshev AuthorDate: 2024-07-20 09:19:29 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-20 09:35:41 +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 --- 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! */