move qmp migrate_set_down && migrate_set_speed to qemumigrate

so we can set the values when the vm is running
also use int() to get json working

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
(cherry picked from commit 3beb415bd7f266934d8f51c3dba0e9b1d536b4a6)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 07116816b86c1f52f2b7760351e8cd5768d78192..9ca8f87ee58822f361788e01b595d5693d94f478 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -327,6 +327,30 @@ sub phase2 {
 
     my $start = time();
 
+    # load_defaults
+    my $defaults = PVE::QemuServer::load_defaults();
+
+    # 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;
+    $migrate_speed = $migrate_speed * 1048576;
+    $self->log('info', "migrate_set_speed: $migrate_speed");
+    eval {
+        PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "migrate_set_speed", value => int($migrate_speed));
+    };
+    $self->log('info', "migrate_set_speed error: $@") if $@;
+
+    my $migrate_downtime = $defaults->{migrate_downtime};
+    $migrate_downtime = $conf->{migrate_downtime} if defined($conf->{migrate_downtime});
+    if (defined($migrate_downtime)) {
+       $self->log('info', "migrate_set_downtime: $migrate_downtime");
+       eval {
+           PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "migrate_set_downtime", value => int($migrate_downtime));
+       };
+       $self->log('info', "migrate_set_downtime error: $@") if $@;
+    }
+
     my $capabilities = {};
     $capabilities->{capability} =  "xbzrle";
     $capabilities->{state} = JSON::false;

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 1101854bc0c5fe68b4fa38ea9ed5ee7d1463074a..a9dd544629bd28e840c93758a41b10eee19bd07b 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2937,21 +2937,6 @@ sub vm_start {
            warn $@ if $@;
        }
 
-       # 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;
-       $migrate_speed = $migrate_speed * 1048576;
-       eval {
-           vm_mon_cmd_nocheck($vmid, "migrate_set_speed", value => $migrate_speed);
-       };
-
-       my $migrate_downtime = $defaults->{migrate_downtime};
-       $migrate_downtime = $conf->{migrate_downtime} if defined($conf->{migrate_downtime});
-       if (defined($migrate_downtime)) {
-           eval { vm_mon_cmd_nocheck($vmid, "migrate_set_downtime", value => $migrate_downtime); };
-       }
-
        if($migratedfrom) {
            my $capabilities = {};
            $capabilities->{capability} =  "xbzrle";