[PATCH qemu-server 2/7] volume snapshot delete: move getting attached device ID to caller

[Fiona Ebner <f.ebner@proxmox.com>]

In preparation to move the volume snapshot helpers to a separate
module that will not depend on QemuConfig.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 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