From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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 9F946B1F0
 for <pve-devel@lists.proxmox.com>; Thu, 28 Apr 2022 18:36:30 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 8CCDA39D4
 for <pve-devel@lists.proxmox.com>; Thu, 28 Apr 2022 18:36:00 +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 743A539C7
 for <pve-devel@lists.proxmox.com>; Thu, 28 Apr 2022 18:35:59 +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 464F942F7A
 for <pve-devel@lists.proxmox.com>; Thu, 28 Apr 2022 18:35:59 +0200 (CEST)
Message-ID: <eb70e98e-dd32-8dc4-8a39-1db82044562c@proxmox.com>
Date: Thu, 28 Apr 2022 18:35:58 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:100.0) Gecko/20100101
 Thunderbird/100.0
Content-Language: en-US
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
 Fabian Ebner <f.ebner@proxmox.com>
References: <20220428113737.105842-1-f.ebner@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
In-Reply-To: <20220428113737.105842-1-f.ebner@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.023 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
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
 http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
 information. [qemu.pm, qemumigrate.pm, qemuserver.pm]
Subject: [pve-devel] applied: [PATCH qemu-server] fix #3861: migrate: fix
 live migration when cloud-init changes storage
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 28 Apr 2022 16:36:30 -0000

On 28.04.22 13:37, Fabian Ebner wrote:
> Generalizes fd95d780 ("migrate: send updated TPM state volid to target
> node") to also handle other offline migrated disks appearing in the
> VM config, which currently should only be cloud-init.
> 
> Breaks migration new -> old under similar (edge-case-)conditions as
> fd95d780 did.
> 
> Keep sending the 'tpmstate0' STDIN parameter to avoid breaking new ->
> old in the scenario fd95d780 fixed.
> 
> Keep parsing the vm_start 'tpmstate0' STDIN parameter to avoid
> breaking old -> new, and to be able to keep sending it.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>  PVE/API2/Qemu.pm   | 10 ++++++----
>  PVE/QemuMigrate.pm | 19 ++++++++++++++-----
>  PVE/QemuServer.pm  | 15 +++++++++------
>  3 files changed, 29 insertions(+), 15 deletions(-)
> 
>

applied, thanks!