For the three qemu-server changes: Reviewed-by: Stefan Reiter <s.rei...@proxmox.com>
I'll also see if I can find some more stuff to cleanup in the code I often traverse :)
On 6/4/21 3:49 PM, Fabian Ebner wrote:
This reverts commit ff09c795edd12b1cc4604ee28a7cdd99cdd1afa8. We wanted to wait until PVE 7.0 for the change to not break migration new -> old until then. Signed-off-by: Fabian Ebner <f.eb...@proxmox.com> --- PVE/QemuMigrate.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 0368a6d..6375a15 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -839,9 +839,8 @@ sub phase2 { my $unix_socket_info = {}; # version > 0 for unix socket support my $nbd_protocol_version = 1; - # 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"; + my $input = "nbd_protocol_version: $nbd_protocol_version\n"; + $input .= "spice_ticket: $spice_ticket\n" if $spice_ticket;my @online_replicated_volumes = $self->filter_local_volumes('online', 1);foreach my $volid (@online_replicated_volumes) {
_______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
