allow dedicated migration network, bug #1177

[qemu-server.git] / PVE / QemuServer.pm

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 728110fbaf7aa89f02f8947d0e132f07e4ed808d..9999b83e4dfe2209a4920f433fd730f7d5ceb1bc 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -217,7 +217,7 @@ my $confdesc = {
        verbose_description => "CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to weights of all the other running VMs.\n\nNOTE: You can disable fair-scheduler configuration by setting this to 0.",
        minimum => 0,
        maximum => 500000,
-       default => 1000,
+       default => 1024,
     },
     memory => {
        optional => 1,
@@ -4429,7 +4429,7 @@ sub vmconfig_update_disk {
 
 sub vm_start {
     my ($storecfg, $vmid, $statefile, $skiplock, $migratedfrom, $paused,
-       $forcemachine, $spice_ticket) = @_;
+       $forcemachine, $spice_ticket, $migration_network, $migration_type) = @_;
 
     PVE::QemuConfig->lock_config($vmid, sub {
        my $conf = PVE::QemuConfig->load_config($vmid, $migratedfrom);
@@ -4459,10 +4459,18 @@ sub vm_start {
                my $localip = "localhost";
                my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
                my $nodename = PVE::INotify::nodename();
-               if ($datacenterconf->{migration_unsecure}) {
+
+               if ($migration_type eq 'insecure') {
+                   my $migrate_network_addr = PVE::Cluster::get_local_migration_ip($migration_network);
+                   if ($migrate_network_addr) {
+                       $localip = $migrate_network_addr;
+                   } else {
                        $localip = PVE::Cluster::remote_node_ip($nodename, 1);
-                       $localip = "[$localip]" if Net::IP::ip_is_ipv6($localip);
+                   }
+
+                   $localip = "[$localip]" if Net::IP::ip_is_ipv6($localip);
                }
+
                my $pfamily = PVE::Tools::get_host_address_family($nodename);
                $migrate_port = PVE::Tools::next_migrate_port($pfamily);
                $migrate_uri = "tcp:${localip}:${migrate_port}";