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 16C6C8B6C7 for ; Thu, 25 Aug 2022 11:25:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 20E4B22FF9 for ; Thu, 25 Aug 2022 11:24:57 +0200 (CEST) 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, 25 Aug 2022 11:24:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7B08743FA8 for ; Thu, 25 Aug 2022 11:24:43 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 25 Aug 2022 11:24:23 +0200 Message-Id: <20220825092440.1810328-15-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220825092440.1810328-1-d.csapak@proxmox.com> References: <20220825092440.1810328-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.094 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm, shared.pm] Subject: [pve-devel] [PATCH qemu-server v2 09/13] PVE/QemuServer: extend 'check_local_resources' for mapped resources 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, 25 Aug 2022 09:25:30 -0000 by adding them to their own list, saving the nodes where they are not allowed, and return those on 'wantarray' Signed-off-by: Dominik Csapak --- PVE/QemuServer.pm | 36 ++++++++++++++++++++++++++++++++++-- test/MigrationTest/Shared.pm | 7 +++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index a17a28b..4551e2b 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2619,6 +2619,21 @@ sub check_local_resources { my ($conf, $noerr) = @_; my @loc_res = (); + my $mapped_res = []; + + my $nodelist = PVE::Cluster::get_nodelist(); + my $hw_map = PVE::HardwareMap::config(); + + my $not_allowed_nodes = { map { $_ => [] } @$nodelist }; + + my $add_not_allowed_nodes = sub { + my ($type, $key, $id) = @_; + for my $node (@$nodelist) { + if (!defined($id) || !defined($hw_map->{$type}->{$id}->{$node})) { + push @{$not_allowed_nodes->{$node}}, $key; + } + } + }; push @loc_res, "hostusb" if $conf->{hostusb}; # old syntax push @loc_res, "hostpci" if $conf->{hostpci}; # old syntax @@ -2626,7 +2641,24 @@ sub check_local_resources { push @loc_res, "ivshmem" if $conf->{ivshmem}; foreach my $k (keys %$conf) { - next if $k =~ m/^usb/ && ($conf->{$k} =~ m/^spice(?![^,])/); + if ($k =~ m/^usb/) { + my $entry = parse_property_string($usb_fmt, $conf->{$k}); + my $usb = PVE::QemuServer::USB::parse_usb_device($entry->{host}); + next if $usb->{spice}; + if ($usb->{mapped}) { + $add_not_allowed_nodes->('usb', $k, $entry->{host}); + push @$mapped_res, $k; + next; + } + } + if ($k =~ m/^hostpci/) { + my $entry = parse_property_string('pve-qm-hostpci', $conf->{$k}); + if ($entry->{host} !~ m/:/) { + $add_not_allowed_nodes->('pci', $k, $entry->{host}); + push @$mapped_res, $k; + next; + } + } # sockets are safe: they will recreated be on the target side post-migrate next if $k =~ m/^serial/ && ($conf->{$k} eq 'socket'); push @loc_res, $k if $k =~ m/^(usb|hostpci|serial|parallel)\d+$/; @@ -2634,7 +2666,7 @@ sub check_local_resources { die "VM uses local resources\n" if scalar @loc_res && !$noerr; - return \@loc_res; + return wantarray ? (\@loc_res, $mapped_res, $not_allowed_nodes) : \@loc_res; } # check if used storages are available on all nodes (use by migrate) diff --git a/test/MigrationTest/Shared.pm b/test/MigrationTest/Shared.pm index 8ae6a6e..0eb94f4 100644 --- a/test/MigrationTest/Shared.pm +++ b/test/MigrationTest/Shared.pm @@ -69,6 +69,13 @@ $cluster_module->mock( }, ); +our $hardware_map_module = Test::MockModule->new("PVE::HardwareMap"); +$hardware_map_module->mock( + config => sub { + return {}; + }, +); + our $ha_config_module = Test::MockModule->new("PVE::HA::Config"); $ha_config_module->mock( vm_is_ha_managed => sub { -- 2.30.2