From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 465C71FF15C for ; Fri, 3 Oct 2025 12:34:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9406EE36; Fri, 3 Oct 2025 12:33:56 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 3 Oct 2025 12:33:10 +0200 Message-ID: <20251003103319.44974-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251003103319.44974-1-f.ebner@proxmox.com> References: <20251003103319.44974-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1759487578188 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% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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] fix #6882: backup provider api: fix backup with TPM state by correctly generating node name 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The backup-access API in QEMU expects the '-backup' suffix to be present for the TPM state fleecing image too. This is a regression of the switch to using blockdev for fleecing images with commit f92c1fa0 ("backup: use blockdev for fleecing images"). Add special handling to the fleecing_node_name() helper to fix it. Fleecing backups to native plugins do not use a dedicated image for the TPM state, so this only affected the backup provider API. Fixes: f92c1fa0 ("backup: use blockdev for fleecing images") Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Blockdev.pm | 6 ++++-- src/PVE/VZDump/QemuServer.pm | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm index 8e6749e8..8fa5eb51 100644 --- a/src/PVE/QemuServer/Blockdev.pm +++ b/src/PVE/QemuServer/Blockdev.pm @@ -43,7 +43,9 @@ my sub tpm_backup_node_name { } my sub fleecing_node_name { - my ($type, $drive_id) = @_; + my ($type, $drive_id, $options) = @_; + + $drive_id .= '-backup' if $options->{'tpm-backup'}; if ($type eq 'fmt') { return "drive-$drive_id-fleecing"; # this is the top node for fleecing @@ -114,7 +116,7 @@ sub get_block_info { my sub get_node_name { my ($type, $drive_id, $volid, $options) = @_; - return fleecing_node_name($type, $drive_id) if $options->{fleecing}; + return fleecing_node_name($type, $drive_id, $options) if $options->{fleecing}; return tpm_backup_node_name($type, $drive_id) if $options->{'tpm-backup'}; my $snap = $options->{'snapshot-name'}; diff --git a/src/PVE/VZDump/QemuServer.pm b/src/PVE/VZDump/QemuServer.pm index 5b94c369..b84957be 100644 --- a/src/PVE/VZDump/QemuServer.pm +++ b/src/PVE/VZDump/QemuServer.pm @@ -659,6 +659,7 @@ my sub attach_fleecing_images { }; my $options = { 'fleecing' => 1 }; + $options->{'tpm-backup'} = 1 if $interface eq 'tpmstate'; # Specify size explicitly, to make it work if storage backend rounded up size for # fleecing image when allocating. $options->{size} = $di->{'block-node-size'} if $format eq 'raw'; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel