From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id BAB561FF0B2 for ; Fri, 25 Sep 2026 14:27:10 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id EBE7621724; Fri, 25 Sep 2026 14:26:54 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 2/7] volume snapshot delete: move getting attached device ID to caller Date: Fri, 25 Sep 2026 14:26:26 +0200 Message-ID: <20260925122646.139215-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260925122646.139215-1-f.ebner@proxmox.com> References: <20260925122646.139215-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1790339209924 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.511 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: ZJ26LGZXV5O3RIJOLTIP4L7CIUATFEZV X-Message-ID-Hash: ZJ26LGZXV5O3RIJOLTIP4L7CIUATFEZV X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: In preparation to move the volume snapshot helpers to a separate module that will not depend on QemuConfig. Signed-off-by: Fiona Ebner --- src/PVE/QemuConfig.pm | 18 +++++++++++++++++- src/PVE/QemuServer.pm | 15 +-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm index 2ef6c075..3dd69ce8 100644 --- a/src/PVE/QemuConfig.pm +++ b/src/PVE/QemuConfig.pm @@ -438,7 +438,23 @@ sub __snapshot_delete_vol_snapshot { my $storecfg = PVE::Storage::config(); my $volid = $drive->{file}; - PVE::QemuServer::qemu_volume_snapshot_delete($vmid, $storecfg, $drive, $snapname); + my $running = PVE::QemuServer::Helpers::vm_running_locally($vmid); + my $attached_deviceid; + + if ($running) { + my $conf = $class->load_config($vmid); + $class->foreach_volume( + $conf, + sub { + my ($ds, $drive) = @_; + $attached_deviceid = "drive-$ds" if $drive->{file} eq $volid; + }, + ); + } + + PVE::QemuServer::qemu_volume_snapshot_delete( + $vmid, $storecfg, $drive, $snapname, $attached_deviceid, $running, + ); push @$unused, $volid; } diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 036dc4c1..e76a6ec4 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -4366,22 +4366,9 @@ sub qemu_volume_snapshot { } sub qemu_volume_snapshot_delete { - my ($vmid, $storecfg, $drive, $snap) = @_; + my ($vmid, $storecfg, $drive, $snap, $attached_deviceid, $running) = @_; my $volid = $drive->{file}; - my $running = PVE::QemuServer::Helpers::vm_running_locally($vmid); - my $attached_deviceid; - - if ($running) { - my $conf = PVE::QemuConfig->load_config($vmid); - PVE::QemuConfig->foreach_volume( - $conf, - sub { - my ($ds, $drive) = @_; - $attached_deviceid = "drive-$ds" if $drive->{file} eq $volid; - }, - ); - } my $do_snapshots_type = do_snapshots_type($storecfg, $drive, $attached_deviceid, $running); -- 2.47.3