[pve-devel] [PATCH qemu-server 4/4] api: enable live migration for marked mapped pci devices

[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 a list of 'mapped-with-live-migration'
entries in the migration preflight api call too.

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 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