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 DD60DB9F1D for ; Mon, 18 Mar 2024 12:18:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C6AC4FA4B for ; Mon, 18 Mar 2024 12:18:39 +0100 (CET) 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 ; Mon, 18 Mar 2024 12:18:39 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 30AE146653 for ; Mon, 18 Mar 2024 12:18:38 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 18 Mar 2024 12:18:33 +0100 Message-Id: <20240318111836.1947580-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318111836.1947580-1-d.csapak@proxmox.com> References: <20240318111836.1947580-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 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 4/4] 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: , X-List-Received-Date: Mon, 18 Mar 2024 11:18:39 -0000 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 a list of 'mapped-with-live-migration' entries in the migration preflight api call too. Signed-off-by: Dominik Csapak --- PVE/API2/Qemu.pm | 5 +++++ PVE/QemuMigrate.pm | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 4ecaeb91..8581a529 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4453,6 +4453,10 @@ __PACKAGE__->register_method({ type => 'array', description => "List of mapped resources e.g. pci, usb" }, + 'mapped-with-live-migration' => { + type => 'array', + description => "List of mapped resources that are marked as capable of live-migration", + }, }, }, code => sub { @@ -4517,6 +4521,7 @@ __PACKAGE__->register_method({ $res->{local_resources} = $local_resources; $res->{'mapped-resources'} = [ map { "$_->{key}" } $mapped_resources->@* ]; + $res->{'mapped-with-live-migration'} = [ map { $_->{'live-migration'} ? "$_->{key}" : () } $mapped_resources->@* ]; return $res; diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 6fe8157d..b3570770 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -246,11 +246,15 @@ 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: " . $mapped_text . "\n"; - } elsif (scalar($missing_mappings->@*)) { + my $missing_live_mappings = []; + for my $res ($mapped_res->@*) { + my $name = "$res->{key}:$res->{device}"; + 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"; } else { $self->log('info', "migrating VM which uses mapped local devices"); } -- 2.39.2