From ff09c795edd12b1cc4604ee28a7cdd99cdd1afa8 Mon Sep 17 00:00:00 2001 From: Mira Limbeck Date: Fri, 20 Mar 2020 10:18:23 +0100 Subject: [PATCH] revert spice_ticket prefix change in 7827de4 The change to the prefixed version broke migration from new to old qemu-server version. This reverts the change and adds a TODO comment for 7.0 to change it to the prefixed version then. Signed-off-by: Mira Limbeck --- PVE/QemuMigrate.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 3e5f0936..10e3e731 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -601,8 +601,9 @@ sub phase2 { my $sock_addr = []; # version > 0 for unix socket support my $nbd_protocol_version = 1; - my $input = "nbd_protocol_version: $nbd_protocol_version\n"; - $input .= "spice_ticket: $spice_ticket\n" if $spice_ticket; + # TODO change to 'spice_ticket: \n' in 7.0 + my $input = $spice_ticket ? "$spice_ticket\n" : "\n"; + $input .= "nbd_protocol_version: $nbd_protocol_version\n"; # Note: We try to keep $spice_ticket secret (do not pass via command line parameter) # instead we pipe it through STDIN