From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E62291FF38C for ; Fri, 31 May 2024 15:13:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BAA6C35CB8; Fri, 31 May 2024 15:13:34 +0200 (CEST) Message-ID: <6a2c3613-f31b-4e91-906c-ece7c45a4ccf@proxmox.com> Date: Fri, 31 May 2024 15:13:31 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion , Dominik Csapak References: <20240419124556.3334691-1-d.csapak@proxmox.com> <20240419124556.3334691-14-d.csapak@proxmox.com> Content-Language: en-US From: Fiona Ebner In-Reply-To: <20240419124556.3334691-14-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.059 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemumigrate.pm, qemu.pm] Subject: Re: [pve-devel] [PATCH qemu-server v3 09/10] api: enable live migration for marked mapped pci devices 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" Am 19.04.24 um 14:45 schrieb Dominik Csapak: > They have to be marked as 'live-migration-capable' in the mapping > config, and the driver and qemu must support it. > > For the gui checks, we now return the whole object of the mapped > resources, which includes info like the name and if it's marked as > live-migration capable. (while deprecating the old 'mapped-resource' > return value, since that returns strictly less information) > > Signed-off-by: Dominik Csapak > --- > PVE/API2/Qemu.pm | 7 ++++++- > PVE/QemuMigrate.pm | 13 +++++++++---- > 2 files changed, 15 insertions(+), 5 deletions(-) > > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > index f2fa345d..f95d8d95 100644 > --- a/PVE/API2/Qemu.pm > +++ b/PVE/API2/Qemu.pm > @@ -4473,7 +4473,11 @@ __PACKAGE__->register_method({ > }, > 'mapped-resources' => { > type => 'array', > - description => "List of mapped resources e.g. pci, usb" > + description => "List of mapped resources e.g. pci, usb. Deprecated, use 'mapped-resource-info' instead." > + }, Please add a comment to remind us to remove it in PVE 9 > + 'mapped-resource-info' => { > + type => 'object', > + description => "Object of mapped resources with additional information such if they're live migratable.", > }, > }, > }, > @@ -4539,6 +4543,7 @@ __PACKAGE__->register_method({ > > $res->{local_resources} = $local_resources; > $res->{'mapped-resources'} = [ keys $mapped_resources->%* ]; > + $res->{'mapped-resource-info'} = $mapped_resources; > > return $res; > > diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm > index a46eb2a3..89caefc7 100644 > --- a/PVE/QemuMigrate.pm > +++ b/PVE/QemuMigrate.pm > @@ -247,11 +247,16 @@ sub prepare { > > 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: $mapped_text\n"; > - } elsif (scalar($missing_mappings->@*)) { > + my $missing_live_mappings = []; > + for my $key (keys $mapped_res->%*) { Maybe sort > + my $res = $mapped_res->{$key}; > + my $name = "$key:$res->{name}"; > + push $missing_live_mappings->@*, $name if !$res->{'live-migration'}; > + } > + if (scalar($missing_mappings->@*)) { > die "can't migrate to '$self->{node}': missing mapped devices " . join(", ", $missing_mappings->@*) . "\n"; > + } elsif ($running && scalar($missing_live_mappings->@*)) { > + die "can't live migrate running VM which uses following mapped devices: " . join(", ", $missing_live_mappings->@*) . "\n"; Style nit: line too long > } else { > $self->log('info', "migrating VM which uses mapped local devices"); > } _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel