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 11F1D9422D 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 AE32FCDAB 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:05 +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 8E75D43C94 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:53 +0200 Message-Id: <20240410110401.2226201-15-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 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: , X-List-Received-Date: Wed, 10 Apr 2024 11:04:42 -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 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 26ede5d1..286355bd 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4451,7 +4451,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." + }, + 'mapped-resource-info' => { + type => 'object', + description => "Object of mapped resources with additional information such if they're live migratable.", }, }, }, @@ -4517,6 +4521,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->%*) { + 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"; } else { $self->log('info', "migrating VM which uses mapped local devices"); } -- 2.39.2