[pve-devel] [PATCH qemu-server v7 4/9] check_local_resources: add more info per mapped device and return as hash

[Dominik Csapak]

such as the mapping name and if it's marked for live-migration (pci only)

Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
---
 PVE/API2/Qemu.pm   |  2 +-
 PVE/QemuMigrate.pm |  7 ++++---
 PVE/QemuServer.pm  | 21 ++++++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index dc8915a7..f6157a3e 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -4736,7 +4736,7 @@ __PACKAGE__->register_method({
        $res->{local_disks} = [ values %$local_disks ];;
 
        $res->{local_resources} = $local_resources;
-       $res->{'mapped-resources'} = $mapped_resources;
+       $res->{'mapped-resources'} = [ sort keys $mapped_resources->%* ];
 
        return $res;
 
diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index c2e36334..2153ac42 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -229,7 +229,7 @@ sub prepare {
     my ($loc_res, $mapped_res, $missing_mappings_by_node) = 
PVE::QemuServer::check_local_resources($conf, $running, 1);
     my $blocking_resources = [];
     for my $res ($loc_res->@*) {
-       if (!grep($res, $mapped_res->@*)) {
+       if (!defined($mapped_res->{$res})) {
            push $blocking_resources->@*, $res;
        }
     }
@@ -241,10 +241,11 @@ sub prepare {
        }
     }
 
-    if (scalar($mapped_res->@*)) {
+    if (scalar(keys $mapped_res->%*)) {
        my $missing_mappings = $missing_mappings_by_node->{$self->{node}};
        if ($running) {
-           die "can't migrate running VM which uses mapped devices: " . 
join(", ", $mapped_res->@*) . "\n";
+           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";
        } else {
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ffd5d56b..ce3c36d8 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2472,7 +2472,7 @@ sub check_local_resources {
     my ($conf, $state, $noerr) = @_;
 
     my @loc_res = ();
-    my $mapped_res = [];
+    my $mapped_res = {};
 
     my @non_migratable_resources = check_non_migratable_resources($conf, 
$state, $noerr);
     push(@loc_res, @non_migratable_resources);
@@ -2507,16 +2507,23 @@ sub check_local_resources {
        if ($k =~ m/^usb/) {
            my $entry = parse_property_string('pve-qm-usb', $conf->{$k});
            next if $entry->{host} && $entry->{host} =~ m/^spice$/i;
-           if ($entry->{mapping}) {
-               $add_missing_mapping->('usb', $k, $entry->{mapping});
-               push @$mapped_res, $k;
+           if (my $name = $entry->{mapping}) {
+               $add_missing_mapping->('usb', $k, $name);
+               $mapped_res->{$k} = { name => $name };
            }
        }
        if ($k =~ m/^hostpci/) {
            my $entry = parse_property_string('pve-qm-hostpci', $conf->{$k});
-           if ($entry->{mapping}) {
-               $add_missing_mapping->('pci', $k, $entry->{mapping});
-               push @$mapped_res, $k;
+           if (my $name = $entry->{mapping}) {
+               $add_missing_mapping->('pci', $k, $name);
+               my $mapped_device = { name => $name };
+               $mapped_res->{$k} = $mapped_device;
+
+               if ($pci_map->{ids}->{$name}->{'live-migration-capable'}) {
+                   $mapped_device->{'live-migration'} = 1;
+                   # don't add mapped device with live migration as blocker
+                   next;
+               }
            }
        }
        # sockets are safe: they will recreated be on the target side 
post-migrate
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel