From 1f726e0a851fb4c60c4af6ed24d9557debcc7c69 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Wed, 8 Apr 2020 11:25:01 +0200 Subject: [PATCH] Use new storage_migrate interface Signed-off-by: Fabian Ebner --- PVE/QemuMigrate.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 2925b90..0bcbd04 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -541,15 +541,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('migration', [$targetsid, $sid], $opts->{bwlimit}); # JSONSchema and get_bandwidth_limit use kbps - storage_migrate bps $bwlimit = $bwlimit * 1024 if defined($bwlimit); - PVE::Storage::storage_migrate($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($storecfg, $volid, $self->{ssh_info}, + $targetsid, $storage_migrate_opts); } } }; -- 2.39.2