[pve-devel] [PATCH v2 qemu-server 20/28] Use new storage_migrate interface

Fabian Ebner f.ebner at proxmox.com
Mon Feb 24 13:44:10 CET 2020


Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---
 PVE/QemuMigrate.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 6db5e62..cc6deb4 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -471,15 +471,19 @@ sub sync_disks {
 		next if $self->{replicated_volumes}->{$volid};
 		push @{$self->{volumes}}, $volid;
 		my $opts = $self->{opts};
-		my $insecure = $opts->{migration_type} eq 'insecure';
-		my $with_snapshots = $local_volumes->{$volid}->{snapshots};
 		# use 'migrate' limit for transfer to other node
 		my $bwlimit = PVE::Storage::get_bandwidth_limit('migrate', [$targetsid, $sid], $opts->{bwlimit});
 		# JSONSchema and get_bandwidth_limit use kbps - storage_migrate bps
 		$bwlimit = $bwlimit * 1024 if defined($bwlimit);
 
-		PVE::Storage::storage_migrate($self->{storecfg}, $volid, $self->{ssh_info}, $targetsid,
-					      undef, undef, undef, $bwlimit, $insecure, $with_snapshots);
+		my $storage_migrate_opts = {
+		    'bwlimit' => $bwlimit,
+		    'insecure' => $opts->{migration_type} eq 'insecure',
+		    'with_snapshots' => $local_volumes->{$volid}->{snapshots},
+		};
+
+		PVE::Storage::storage_migrate($self->{storecfg}, $volid,
+		    $self->{ssh_info}, $targetsid, $storage_migrate_opts);
 	    }
 	}
     };
-- 
2.20.1




More information about the pve-devel mailing list