From 683ab654915d6b5e0420b0f7e4e9a4fb479c7266 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 5 Feb 2020 09:43:09 +0100 Subject: [PATCH] migrate: re-order lines to improve readability MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- PVE/QemuMigrate.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 81b52d1..1f6e306 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -686,10 +686,13 @@ sub phase2 { foreach my $drive (keys %{$self->{target_drive}}){ my $target = $self->{target_drive}->{$drive}; my $nbd_uri = $target->{nbd_uri}; - my $target_drive = PVE::QemuServer::parse_drive($drive, $target->{drivestr}); + my $source_drive = PVE::QemuServer::parse_drive($drive, $conf->{$drive}); + my $target_drive = PVE::QemuServer::parse_drive($drive, $target->{drivestr}); + my $source_sid = PVE::Storage::Plugin::parse_volume_id($source_drive->{file}); my $target_sid = PVE::Storage::Plugin::parse_volume_id($target_drive->{file}); + my $bwlimit = PVE::Storage::get_bandwidth_limit('migrate', [$source_sid, $target_sid], $opt_bwlimit); $self->log('info', "$drive: start migration to $nbd_uri"); -- 2.39.2