proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-02 18:59:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert spice_ticket prefix change in 7827de4

Browse Source 
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@proxmox.com>
This commit is contained in:
Mira Limbeck 2020-03-20 10:18:23 +01:00 committed by Thomas Lamprecht
parent 746232eeb1
commit ff09c795ed
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/QemuMigrate.pm
View File

@ -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