From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id E69561FF0DF for ; Thu, 15 Oct 2026 09:54:34 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id AAD5921464; Thu, 15 Oct 2026 09:54:32 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 2/5] usb: drop always-true spice_usb3 feature flag Date: Thu, 15 Oct 2026 09:52:16 +0200 Message-ID: <20261015075428.572882-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261015075428.572882-1-d.csapak@proxmox.com> References: <20261015075428.572882-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.371 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: LR275KPRW53KF3QQBHACVAZLKAIPT4GP X-Message-ID-Hash: LR275KPRW53KF3QQBHACVAZLKAIPT4GP X-MailFrom: d.csapak@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The 'spice_usb3' feature was only set for machine versions 4.0 and newer. Since config_to_command refuses to start machines older than 5.0, the flag is always set, so a SPICE USB port with 'usb3' enabled always ends up on the xhci controller anyway. Drop the feature hash from get_usb_devices and check 'usb3' directly. Signed-off-by: Dominik Csapak --- src/PVE/QemuServer.pm | 8 +------- src/PVE/QemuServer/USB.pm | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 7e5f7bbb..097c88b6 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -3325,13 +3325,7 @@ sub config_to_command { $vmid, $conf, $devices, $vga, $winversion, $arch, $bootorder, $dry_run, ); - # usb devices - my $usb_dev_features = {}; - $usb_dev_features->{spice_usb3} = 1 if min_version($machine_version, 4, 0); - - my @usbdevices = PVE::QemuServer::USB::get_usb_devices( - $conf, $usb_dev_features, $bootorder, $machine_version, - ); + my @usbdevices = PVE::QemuServer::USB::get_usb_devices($conf, $bootorder, $machine_version); push @$devices, @usbdevices if @usbdevices; # serial devices diff --git a/src/PVE/QemuServer/USB.pm b/src/PVE/QemuServer/USB.pm index d75507e4..bf2741f6 100644 --- a/src/PVE/QemuServer/USB.pm +++ b/src/PVE/QemuServer/USB.pm @@ -168,7 +168,7 @@ sub get_usb_controllers { } sub get_usb_devices { - my ($conf, $features, $bootorder, $machine_version) = @_; + my ($conf, $bootorder, $machine_version) = @_; my $devices = []; @@ -190,7 +190,7 @@ sub get_usb_devices { if ($d->{host} && $d->{host} =~ m/^spice$/) { # usb redir support for spice my $bus = 'ehci'; - $bus = 'xhci' if ($d->{usb3} && $features->{spice_usb3}) || $use_qemu_xhci; + $bus = 'xhci' if $d->{usb3} || $use_qemu_xhci; push @$devices, '-chardev', "spicevmc,id=usbredirchardev$i,name=usbredir"; push @$devices, '-device', print_spice_usbdevice($i, $bus, $port); -- 2.47.3