[PATCH qemu-server 2/5] usb: drop always-true spice_usb3 feature flag

[Dominik Csapak <d.csapak@proxmox.com>]

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 <d.csapak@proxmox.com>
---
 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