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 95E0294239 for ; Wed, 10 Apr 2024 13:04:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EA025CDAC for ; Wed, 10 Apr 2024 13:04:09 +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 ; Wed, 10 Apr 2024 13:04:06 +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 A5E4043C6E for ; Wed, 10 Apr 2024 13:04:05 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 13:03:52 +0200 Message-Id: <20240410110401.2226201-14-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410110401.2226201-1-d.csapak@proxmox.com> References: <20240410110401.2226201-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 Subject: [pve-devel] [PATCH qemu-server v2 08/10] 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: , X-List-Received-Date: Wed, 10 Apr 2024 11:04:42 -0000 such as the mapping name and if it's marked for live-migration (pci only) Signed-off-by: Dominik Csapak --- 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 497987ff..26ede5d1 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4516,7 +4516,7 @@ __PACKAGE__->register_method({ $res->{local_disks} = [ values %$local_disks ];; $res->{local_resources} = $local_resources; - $res->{'mapped-resources'} = $mapped_resources; + $res->{'mapped-resources'} = [ keys $mapped_resources->%* ]; return $res; diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 381022f5..a46eb2a3 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -233,7 +233,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; } } @@ -245,10 +245,11 @@ sub prepare { } } - if (scalar($mapped_res->@*)) { + if (scalar(keys $mapped_res->%*)) { my $missing_mappings = $missing_mappings_by_node->{$self->{node}}; + my $mapped_text = join(", ", keys $mapped_res->%*); if ($running) { - die "can't migrate running VM which uses mapped devices: " . join(", ", $mapped_res->@*) . "\n"; + 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 771bef82..91ad61a5 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2566,7 +2566,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(); @@ -2598,16 +2598,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