From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0D78B7062D for ; Mon, 7 Jun 2021 10:27:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F3660E9B5 for ; Mon, 7 Jun 2021 10:27:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DC053E9A6 for ; Mon, 7 Jun 2021 10:27:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AD88D42BF3 for ; Mon, 7 Jun 2021 10:27:31 +0200 (CEST) To: Proxmox VE development discussion , Fabian Ebner References: <20210604134946.152720-1-f.ebner@proxmox.com> <20210604134946.152720-5-f.ebner@proxmox.com> From: Stefan Reiter Message-ID: Date: Mon, 7 Jun 2021 10:27:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20210604134946.152720-5-f.ebner@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.989 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH qemu-server 1/3] Revert "revert spice_ticket prefix change in 7827de4" X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2021 08:27:36 -0000 For the three qemu-server changes: Reviewed-by: Stefan Reiter 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 > --- > 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: \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) { >