set correct migrate speed

We overwrite slow kvm default.

diff --git a/Makefile b/Makefile
index 4ead0b007bc1c078014fb44358c3d5862ea98fdc..7a5793b6202b2fadb04465d9cdc39bb766a99c66 100644 (file)
--- 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 b926cfb787cece8f3fcde64716b4e0012aae656b..621fa0cce3ed3fc5412073e235d9cd02f0f858ec 100644 (file)
--- 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 7e98a9305a80835b2232887569135bd57fd95d83..4721d0b0d4c770f30266fddf09ebe86b8f6c73fc 100644 (file)
--- 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