From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D3C8D1FF183 for ; Wed, 3 Dec 2025 14:31:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C476FA319; Wed, 3 Dec 2025 14:30:33 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 3 Dec 2025 14:26:40 +0100 Message-ID: <20251203132949.109685-15-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251203132949.109685-1-f.ebner@proxmox.com> References: <20251203132949.109685-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1764768549156 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 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 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 14/18] blockdev: switch blockdev_delete() to use QMP peer 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" In preparation to allow snapshot operations for QSD-FUSE-exported TPM states. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Blockdev.pm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm index b89b0f68..7e43fbc9 100644 --- a/src/PVE/QemuServer/Blockdev.pm +++ b/src/PVE/QemuServer/Blockdev.pm @@ -906,9 +906,9 @@ sub blockdev_external_snapshot { } sub blockdev_delete { - my ($storecfg, $vmid, $drive, $file_blockdev, $fmt_blockdev, $snap) = @_; + my ($storecfg, $qmp_peer, $drive, $file_blockdev, $fmt_blockdev, $snap) = @_; - eval { detach(vm_qmp_peer($vmid), $fmt_blockdev->{'node-name'}); }; + eval { detach($qmp_peer, $fmt_blockdev->{'node-name'}); }; warn "detaching block node for $file_blockdev->{filename} failed - $@" if $@; #delete the file (don't use vdisk_free as we don't want to delete all snapshot chain) @@ -1092,7 +1092,12 @@ sub blockdev_commit { } blockdev_delete( - $storecfg, $vmid, $drive, $src_file_blockdev, $src_fmt_blockdev, $src_snap, + $storecfg, + vm_qmp_peer($vmid), + $drive, + $src_file_blockdev, + $src_fmt_blockdev, + $src_snap, ); }; my $err = $@; @@ -1172,7 +1177,14 @@ sub blockdev_stream { die "Failed to complete block stream: $@\n"; } - blockdev_delete($storecfg, $vmid, $drive, $snap_file_blockdev, $snap_fmt_blockdev, $snap); + blockdev_delete( + $storecfg, + vm_qmp_peer($vmid), + $drive, + $snap_file_blockdev, + $snap_fmt_blockdev, + $snap, + ); } 1; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel