[pve-devel] [PATCH qemu-server 1/2] fix #6882: backup provider api: fix backup with TPM state by correctly generating node name

[Fiona Ebner]

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 <f.ebner at proxmox.com>
---
 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