diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 07116816..9ca8f87e 100644 --- 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 165eaf6b..92c7db79 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2976,21 +2976,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";