From 8f43ac4893e731381e891b09f08bdbbf0e909cb6 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Thu, 29 Apr 2021 14:27:41 +0200
Subject: [PATCH] Revert "migration: do not set default speed limit"

The default was changed for 5.2, so while it is not 32 MiB/s anymore,
it is still 128 MiB/s which I did not notice on my 1 Gbps (or < 125
MiB/s) setup. For users with links faster than one gigabit it now did
some limiting - so setup a very high limit so than even 100G should
not max this out.

This reverts commit a89bd100846f8e923aa7d15863b92e6e2d7264d2.
---
 PVE/QemuMigrate.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index e9bcade2..0368a6d8 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -966,8 +966,7 @@ sub phase2 {
     # migrate_speed parameter in qm.conf - take the lower of the two.
     my $bwlimit = PVE::Storage::get_bandwidth_limit('migration', undef, $self->{opts}->{bwlimit}) // 0;
     my $migrate_speed = $conf->{migrate_speed} // 0;
-    # migrate_speed is in MB/s, bwlimit in KB/s
-    $migrate_speed *= 1024;
+    $migrate_speed *= 1024; # migrate_speed is in MB/s, bwlimit in KB/s
 
     if ($bwlimit && $migrate_speed) {
 	$migrate_speed = ($bwlimit < $migrate_speed) ? $bwlimit : $migrate_speed;
@@ -979,8 +978,11 @@ sub phase2 {
     if ($migrate_speed) {
 	$migrate_speed *= 1024; # qmp takes migrate_speed in B/s.
 	$self->log('info', "migration speed limit: ". render_bytes($migrate_speed, 1) ."/s");
-	$qemu_migrate_params->{'max-bandwidth'} = int($migrate_speed);
+    } else {
+	# always set migrate speed as QEMU default to 128 MiBps == 1 Gbps, use 16 GiBps == 128 Gbps
+	$migrate_speed = (16 << 30);
     }
+    $qemu_migrate_params->{'max-bandwidth'} = int($migrate_speed);
 
     my $migrate_downtime = $defaults->{migrate_downtime};
     $migrate_downtime = $conf->{migrate_downtime} if defined($conf->{migrate_downtime});