From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0E1E21FF16E for <inbox@lore.proxmox.com>; Mon, 20 Jan 2025 15:52:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C1DA41DE9B; Mon, 20 Jan 2025 15:52:09 +0100 (CET) From: Dominik Csapak <d.csapak@proxmox.com> To: pve-devel@lists.proxmox.com Date: Mon, 20 Jan 2025 15:51:46 +0100 Message-Id: <20250120145203.282363-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250120145203.282363-1-d.csapak@proxmox.com> References: <20250120145203.282363-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 v5 01/11] usb: mapping: move implementation of find_on_current_node here X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> this was the only user, and it's easy enough Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> --- changes from v4: * refactor code into sub to keep the 'parse_usb_device' function smaller PVE/QemuServer/USB.pm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer/USB.pm b/PVE/QemuServer/USB.pm index 017ef9c0..c701485b 100644 --- a/PVE/QemuServer/USB.pm +++ b/PVE/QemuServer/USB.pm @@ -5,6 +5,7 @@ use warnings; use PVE::QemuServer::PCI qw(print_pci_addr); use PVE::QemuServer::Machine; use PVE::QemuServer::Helpers qw(min_version windows_version); +use PVE::INotify; use PVE::JSONSchema; use PVE::Mapping::USB; use base 'Exporter'; @@ -74,6 +75,18 @@ our $usbdesc = { }; PVE::JSONSchema::register_standard_option("pve-qm-usb", $usbdesc); +my sub get_current_node_mapping { + my ($mapping) = @_; + + my $config = PVE::Mapping::USB::config(); + my $node = PVE::INotify::nodename(); + my $devices = PVE::Mapping::USB::get_node_mapping($config, $mapping, $node); + die "USB device mapping not found for '$mapping'\n" if !$devices || !scalar($devices->@*); + die "More than one USB mapping per host not supported\n" if scalar($devices->@*) > 1; + + return $devices; +} + sub parse_usb_device { my ($value, $mapping) = @_; @@ -91,9 +104,7 @@ sub parse_usb_device { $res->{spice} = 1; } } elsif (defined($mapping)) { - my $devices = PVE::Mapping::USB::find_on_current_node($mapping); - die "USB device mapping not found for '$mapping'\n" if !$devices || !scalar($devices->@*); - die "More than one USB mapping per host not supported\n" if scalar($devices->@*) > 1; + my $devices = get_current_node_mapping($mapping); eval { PVE::Mapping::USB::assert_valid($mapping, $devices->[0]); }; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel