From 48e1a963f4946c552e52b2cfaa761c338ce356cc Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 23 Nov 2011 09:11:07 +0100
Subject: [PATCH] set correct migrate speed

We overwrite slow kvm default.
---
 Makefile          |  2 +-
 PVE/QemuServer.pm | 13 ++++++++-----
 changelog.Debian  |  6 ++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4ead0b00..7a5793b6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=5
+PKGREL=6
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index b926cfb7..621fa0cc 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2378,12 +2378,15 @@ sub vm_start {
 		eval  { vm_monitor_command($vmid, "cont", 1) };
 	    }
 	}
-
-	if (my $migrate_speed =
-	    $conf->{migrate_speed} || $defaults->{migrate_speed}) {
+	
+	# always set migrate speed (overwrite kvm default of 32m)
+	# we set a very hight default of 8192m which is basically unlimited
+	my $migrate_speed = $defaults->{migrate_speed} || 8192;
+	$migrate_speed = $conf->{migrate_speed} || $migrate_speed;
+	eval { 
 	    my $cmd = "migrate_set_speed ${migrate_speed}m";
-	    eval { vm_monitor_command($vmid, $cmd, 1); };
-	}
+	    vm_monitor_command($vmid, $cmd, 1); 
+	};
 
 	if (my $migrate_downtime =
 	    $conf->{migrate_downtime} || $defaults->{migrate_downtime}) {
diff --git a/changelog.Debian b/changelog.Debian
index 7e98a930..4721d0b0 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-6) unstable; urgency=low
+
+  * set correct migrate speed
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 23 Nov 2011 09:12:12 +0100
+
 qemu-server (2.0-5) unstable; urgency=low
 
   * fix vzdump stop mode