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 7C520759A4 for ; Thu, 14 Oct 2021 11:29:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 72A3E1C175 for ; Thu, 14 Oct 2021 11:29:40 +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 B55CC1C169 for ; Thu, 14 Oct 2021 11:29:38 +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 8FCA7461CC for ; Thu, 14 Oct 2021 11:29:38 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Thu, 14 Oct 2021 11:28:48 +0200 Message-Id: <20211014092849.2397997-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.505 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 Subject: [pve-devel] [PATCH qemu-server 1/2] snapshot: fix tpmstate with rbd 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: Thu, 14 Oct 2021 09:29:40 -0000 QEMU doesn't know about the tpmstate, so 'do_snapshots_with_qemu' should never return true in that case. Note that inconsistencies related to snapshot timing do not matter much, as the actual TPM data is exported together with other device state by QEMU anyway. Signed-off-by: Stefan Reiter --- As reported in the forum: https://forum.proxmox.com/threads/vtpm-support-do-we-have-guide-to-add-the-vtpm-support.56982/post-423381 PVE/QemuServer.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 6fc28e8..d5dfdbb 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4542,7 +4542,7 @@ sub qemu_volume_snapshot { my $running = check_running($vmid); - if ($running && do_snapshots_with_qemu($storecfg, $volid)){ + if ($running && do_snapshots_with_qemu($storecfg, $volid, $deviceid)) { mon_cmd($vmid, 'blockdev-snapshot-internal-sync', device => $deviceid, name => $snap); } else { PVE::Storage::volume_snapshot($storecfg, $volid, $snap); @@ -4564,7 +4564,7 @@ sub qemu_volume_snapshot_delete { }); } - if ($running && do_snapshots_with_qemu($storecfg, $volid)){ + if ($running && do_snapshots_with_qemu($storecfg, $volid, $deviceid)) { mon_cmd($vmid, 'blockdev-snapshot-delete-internal-sync', device => $deviceid, name => $snap); } else { PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snap, $running); @@ -7017,7 +7017,9 @@ my $qemu_snap_storage = { rbd => 1, }; sub do_snapshots_with_qemu { - my ($storecfg, $volid) = @_; + my ($storecfg, $volid, $deviceid) = @_; + + return if $deviceid =~ m/tpmstate0/; my $storage_name = PVE::Storage::parse_volume_id($volid); my $scfg = $storecfg->{ids}->{$storage_name}; -- 2.30.2