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 2ABC0904A9 for ; Tue, 2 Apr 2024 11:36:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0B8D3191F for ; Tue, 2 Apr 2024 11:35:38 +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 ; Tue, 2 Apr 2024 11:35:34 +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 2869B448DD; Tue, 2 Apr 2024 11:35:34 +0200 (CEST) Message-ID: Date: Tue, 2 Apr 2024 11:35:33 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Fiona Ebner , Proxmox VE development discussion References: <20240318111836.1947580-1-d.csapak@proxmox.com> <20240318111836.1947580-6-d.csapak@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 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, qemumigrate.pm, qemu.pm] Subject: Re: [pve-devel] [PATCH qemu-server 3/4] check_local_resources: add more info per mapped device 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: Tue, 02 Apr 2024 09:36:08 -0000 On 3/22/24 14:37, Fiona Ebner wrote: > Am 18.03.24 um 12:18 schrieb Dominik Csapak: >> 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 | 5 +++-- >> PVE/QemuServer.pm | 10 ++++++---- >> 3 files changed, 10 insertions(+), 7 deletions(-) >> >> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm >> index 497987ff..4ecaeb91 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'} = [ map { "$_->{key}" } $mapped_resources->@* ]; > > Or should it become a hash? Then you could use 'keys' instead of map and > a 'key' property. yes that makes sense. Since we change the internal structure, we have to adapt all call sites anyway... > >> >> return $res; >> >> diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm >> index 8d9b35ae..6fe8157d 100644 >> --- a/PVE/QemuMigrate.pm >> +++ b/PVE/QemuMigrate.pm >> @@ -232,7 +232,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->@*)) { > > Seems like this is currently broken. I.e. it should be $res eq $_ yep, seems i have to improve my tests running with that (maybe i can whip up some automated ones to send along) > >> + if (!grep { $_->{key} eq $res } $mapped_res->@*) { >> push $blocking_resources->@*, $res; >> } >> } >> @@ -246,8 +246,9 @@ sub prepare { >> >> if (scalar($mapped_res->@*)) { >> my $missing_mappings = $missing_mappings_by_node->{$self->{node}}; >> + my $mapped_text = join(", ", map { $_->{key} } $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"; > > Style nit: no need for the concatenation anymore, can just use the > variable inside the string. > >> } 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 6e2c8052..ef3aee20 100644 >> --- a/PVE/QemuServer.pm >> +++ b/PVE/QemuServer.pm >> @@ -2600,14 +2600,16 @@ sub check_local_resources { >> next if $entry->{host} && $entry->{host} =~ m/^spice$/i; >> if ($entry->{mapping}) { >> $add_missing_mapping->('usb', $k, $entry->{mapping}); >> - push @$mapped_res, $k; >> + push @$mapped_res, { key => $k, device => $entry->{mapping} }; > > Should we name the second key 'name'/'mapping'/'id' instead of 'device'? yeah name is probably better here... > >> } >> } >> 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 = { key => $k, device => $name }; >> + $mapped_device->{'live-migration'} = 1 if $pci_map->{ids}->{$name}->{'live-migration-capable'}; > > Style nit: line too long > >> + push @$mapped_res, $mapped_device; >> } >> } >> # sockets are safe: they will recreated be on the target side post-migrate