From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 50A178E10D for ; Thu, 10 Nov 2022 15:36:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3CFBE284E0 for ; Thu, 10 Nov 2022 15:36:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 10 Nov 2022 15:36:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A4C4A44A9A for ; Thu, 10 Nov 2022 15:36:01 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 10 Nov 2022 15:35:57 +0100 Message-Id: <20221110143600.258897-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221110143600.258897-1-d.csapak@proxmox.com> References: <20221110143600.258897-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 6/7] USB: increase max usb devices to 14 for newer machine version and ostype X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Nov 2022 14:36:45 -0000 for machine versions >= 7.1 and ostype linux or windows > 7, we use the qemu-xhci controller where we have up to 14 usable ports, so make them available to the user Signed-off-by: Dominik Csapak --- PVE/QemuServer.pm | 5 +++-- PVE/QemuServer/USB.pm | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 452eb10..3a0704a 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -823,7 +823,7 @@ while (my ($k, $v) = each %$confdesc) { PVE::JSONSchema::register_standard_option("pve-qm-$k", $v); } -my $MAX_USB_DEVICES = 5; +my $MAX_USB_DEVICES = 14; my $MAX_NETS = 32; my $MAX_SERIAL_PORTS = 4; my $MAX_PARALLEL_PORTS = 3; @@ -1102,7 +1102,8 @@ EODESCR my $usbdesc = { optional => 1, type => 'string', format => $usb_fmt, - description => "Configure an USB device (n is 0 to 4).", + description => "Configure an USB device (n is 0 to 4, for machine version >= 7.1 and ostype" + ." l26 or windows > 7, n can be up to 14).", }; PVE::JSONSchema::register_standard_option("pve-qm-usb", $usbdesc); diff --git a/PVE/QemuServer/USB.pm b/PVE/QemuServer/USB.pm index 96931d4..7def04d 100644 --- a/PVE/QemuServer/USB.pm +++ b/PVE/QemuServer/USB.pm @@ -14,6 +14,8 @@ get_usb_controllers get_usb_devices ); +my $OLD_MAX_USB = 5; + sub parse_usb_device { my ($value) = @_; @@ -35,6 +37,15 @@ sub parse_usb_device { return $res; } +my sub check_usb_index { + my ($index, $use_qemu_xhci) = @_; + + die "using usb$index is only possible with machine type >= 7.1 and ostype l26 or windows > 7\n" + if $index >= $OLD_MAX_USB && !$use_qemu_xhci; + + return undef; +} + sub get_usb_controllers { my ($conf, $bridges, $arch, $machine, $format, $max_usb_devices, $machine_version) = @_; @@ -72,6 +83,7 @@ sub get_usb_controllers { my $use_usb = 0; for (my $i = 0; $i < $max_usb_devices; $i++) { next if !$conf->{"usb$i"}; + check_usb_index($i, $use_qemu_xhci); my $d = eval { PVE::JSONSchema::parse_property_string($format,$conf->{"usb$i"}) }; next if !$d; $use_usb = 1; @@ -100,6 +112,7 @@ sub get_usb_devices { for (my $i = 0; $i < $max_usb_devices; $i++) { my $devname = "usb$i"; next if !$conf->{$devname}; + check_usb_index($i, $use_qemu_xhci); my $d = eval { PVE::JSONSchema::parse_property_string($format,$conf->{$devname}) }; next if !$d; -- 2.30.2