From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 6070A1FF396 for ; Thu, 6 Jun 2024 11:23:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 65189B2DF; Thu, 6 Jun 2024 11:23:04 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Jun 2024 11:22:09 +0200 Message-Id: <20240606092220.1190913-15-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606092220.1190913-1-d.csapak@proxmox.com> References: <20240606092220.1190913-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 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 - Subject: [pve-devel] [PATCH qemu-server v4 08/12] check_local_resources: add more info per mapped device and return as hash 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" such as the mapping name and if it's marked for live-migration (pci only) Signed-off-by: Dominik Csapak --- changes from v3: * sort keys * move text variable into if branch PVE/API2/Qemu.pm | 2 +- PVE/QemuMigrate.pm | 7 ++++--- PVE/QemuServer.pm | 17 ++++++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 2a1d4d79..65195515 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4538,7 +4538,7 @@ __PACKAGE__->register_method({ $res->{local_disks} = [ values %$local_disks ];; $res->{local_resources} = $local_resources; - $res->{'mapped-resources'} = $mapped_resources; + $res->{'mapped-resources'} = [ sort keys $mapped_resources->%* ]; return $res; diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 4cad14ef..a87e11c0 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -236,7 +236,7 @@ sub prepare { my ($loc_res, $mapped_res, $missing_mappings_by_node) = PVE::QemuServer::check_local_resources($conf, 1); my $blocking_resources = []; for my $res ($loc_res->@*) { - if (!grep($res, $mapped_res->@*)) { + if (!defined($mapped_res->{$res})) { push $blocking_resources->@*, $res; } } @@ -248,10 +248,11 @@ sub prepare { } } - if (scalar($mapped_res->@*)) { + if (scalar(keys $mapped_res->%*)) { my $missing_mappings = $missing_mappings_by_node->{$self->{node}}; if ($running) { - die "can't migrate running VM which uses mapped devices: " . join(", ", $mapped_res->@*) . "\n"; + my $mapped_text = join(", ", sort keys $mapped_res->%*); + die "can't migrate running VM which uses mapped devices: $mapped_text\n"; } elsif (scalar($missing_mappings->@*)) { die "can't migrate to '$self->{node}': missing mapped devices " . join(", ", $missing_mappings->@*) . "\n"; } else { diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 2d583ddf..5275d7a4 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2562,7 +2562,7 @@ sub check_local_resources { my ($conf, $noerr) = @_; my @loc_res = (); - my $mapped_res = []; + my $mapped_res = {}; my $nodelist = PVE::Cluster::get_nodelist(); my $pci_map = PVE::Mapping::PCI::config(); @@ -2594,16 +2594,19 @@ sub check_local_resources { if ($k =~ m/^usb/) { my $entry = parse_property_string('pve-qm-usb', $conf->{$k}); next if $entry->{host} && $entry->{host} =~ m/^spice$/i; - if ($entry->{mapping}) { - $add_missing_mapping->('usb', $k, $entry->{mapping}); - push @$mapped_res, $k; + if (my $name = $entry->{mapping}) { + $add_missing_mapping->('usb', $k, $name); + $mapped_res->{$k} = { name => $name }; } } if ($k =~ m/^hostpci/) { my $entry = parse_property_string('pve-qm-hostpci', $conf->{$k}); - if ($entry->{mapping}) { - $add_missing_mapping->('pci', $k, $entry->{mapping}); - push @$mapped_res, $k; + if (my $name = $entry->{mapping}) { + $add_missing_mapping->('pci', $k, $name); + my $mapped_device = { name => $name }; + $mapped_device->{'live-migration'} = 1 + if $pci_map->{ids}->{$name}->{'live-migration-capable'}; + $mapped_res->{$k} = $mapped_device; } } # sockets are safe: they will recreated be on the target side post-migrate -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel