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 B27941FF396 for ; Thu, 6 Jun 2024 11:22:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9785AAF9F; Thu, 6 Jun 2024 11:22:54 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Jun 2024 11:22:10 +0200 Message-Id: <20240606092220.1190913-16-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 09/12] 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" 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 --- changes from v3: * added reminder to remove deprecated value * shorten too long lines * sort keys for mapped_res PVE/API2/Qemu.pm | 8 +++++++- PVE/QemuMigrate.pm | 17 ++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 65195515..24b82c6e 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4471,9 +4471,14 @@ __PACKAGE__->register_method({ type => 'array', description => "List local resources e.g. pci, usb" }, + # FIXME: remove with 9.0 '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." + }, + 'mapped-resource-info' => { + type => 'object', + description => "Object of mapped resources with additional information such if they're live migratable.", }, }, }, @@ -4539,6 +4544,7 @@ __PACKAGE__->register_method({ $res->{local_resources} = $local_resources; $res->{'mapped-resources'} = [ sort keys $mapped_resources->%* ]; + $res->{'mapped-resource-info'} = $mapped_resources; return $res; diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index a87e11c0..41ff12c2 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -250,11 +250,18 @@ sub prepare { if (scalar(keys $mapped_res->%*)) { my $missing_mappings = $missing_mappings_by_node->{$self->{node}}; - if ($running) { - 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"; + my $missing_live_mappings = []; + for my $key (sort keys $mapped_res->%*) { + my $res = $mapped_res->{$key}; + my $name = "$key:$res->{name}"; + push $missing_live_mappings->@*, $name if !$res->{'live-migration'}; + } + if (scalar($missing_mappings->@*)) { + my $missing = join(", ", $missing_mappings->@*); + die "can't migrate to '$self->{node}': missing mapped devices $missing\n"; + } elsif ($running && scalar($missing_live_mappings->@*)) { + my $missing = join(", ", $missing_live_mappings->@*); + die "can't live migrate running VM which uses following mapped devices: $missing\n"; } else { $self->log('info', "migrating VM which uses mapped local devices"); } -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel