[pve-devel] [PATCH qemu-server] revert spice_ticket prefix change in 7827de4

[Mira Limbeck]

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 <m.limbeck at proxmox.com>
---
Please test it as with my arch linux virt-viewer version it just
segfaults or aborts most of the time, even without any of the spice
ticket changes

 PVE/QemuMigrate.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 3e5f093..10e3e73 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: <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
-- 
2.20.1