[pve-devel] [PATCH qemu-server v2 13/32] vm start: assert that migration type is set for 'tcp' migration

[Fiona Ebner]

The parameter is always set since commit 2de2d6f7 ("allow dedicated
migration network, bug #1177"), qemu-server 4.0-93.

Suggested-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
---

New in v2.

 src/PVE/QemuServer.pm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 5ab3a8c3..ea990751 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -6043,16 +6043,9 @@ sub vm_start_nolock {
         if ($statefile eq 'tcp') {
             my $migrate = $res->{migrate} = { proto => 'tcp' };
             $migrate->{addr} = "localhost";
-            my $datacenterconf = PVE::Cluster::cfs_read_file('datacenter.cfg');
             my $nodename = nodename();
 
-            if (!defined($migration_type)) {
-                if (defined($datacenterconf->{migration}->{type})) {
-                    $migration_type = $datacenterconf->{migration}->{type};
-                } else {
-                    $migration_type = 'secure';
-                }
-            }
+            die "no migration type set\n" if !defined($migration_type);
 
             if ($migration_type eq 'insecure') {
                 $migrate->{addr} = $get_migration_ip->($nodename);
-- 
2.39.5