[RFC PATCH qemu-server 4/4] integrate new sub 'activate_current_vm_volumes'

[Daniel Herzig <d.herzig@proxmox.com>]

Signed-off-by: Daniel Herzig <d.herzig@proxmox.com>
---
 src/PVE/QemuServer.pm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index a7b98e01..8b4510d6 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -5598,16 +5598,18 @@ sub vm_start_nolock {
         $state_cmdline = ['-S'];
     }
 
-    my $vollist = get_current_vm_volumes($storecfg, $conf);
-    push $vollist->@*, $statefile if $statefile_is_a_volume;
+    my $storage_hints = generate_storage_hints($conf, 1);
+    my $activated_vollist;
+    if ($statefile_is_a_volume) {
+	$activated_vollist = activate_current_vm_volumes($storecfg, $conf, $vmid, $statefile, $storage_hints);
+    } else {
+	$activated_vollist = activate_current_vm_volumes($storecfg, $conf, $vmid, undef, $storage_hints);
+    }
 
     my ($cmd, $spice_port, $start_timeout);
     my $pci_reserve_list = [];
     eval {
-        # With -blockdev, it is necessary to activate the volumes before generating the command line
         # Plugins can safely deactivate already-active volumes here if needed
-        my $storage_hints = generate_storage_hints($conf, 1);
-        PVE::Storage::activate_volumes($storecfg, $vollist, undef, $storage_hints);
 
         check_efi_vars($storecfg, $vmid, $conf) if $conf->{bios} && $conf->{bios} eq 'ovmf';
 
@@ -5673,7 +5675,7 @@ sub vm_start_nolock {
         push @$cmd, '-uuid', $uuid if defined($uuid);
     };
     if (my $err = $@) {
-        eval { PVE::Storage::deactivate_volumes($storecfg, $vollist); };
+        eval { PVE::Storage::deactivate_volumes($storecfg, $activated_vollist); };
         warn $@ if $@;
         eval { cleanup_pci_devices($vmid, $conf) };
         warn $@ if $@;
@@ -5804,7 +5806,7 @@ sub vm_start_nolock {
 
     if (my $err = $@) {
         # deactivate volumes if start fails
-        eval { PVE::Storage::deactivate_volumes($storecfg, $vollist); };
+        eval { PVE::Storage::deactivate_volumes($storecfg, $activated_vollist); };
         warn $@ if $@;
         eval { cleanup_pci_devices($vmid, $conf) };
         warn $@ if $@;
@@ -5994,12 +5996,11 @@ sub vm_commandline {
     my $defaults = load_defaults();
 
     my $running = PVE::QemuServer::Helpers::vm_running_locally($vmid);
-    my $volumes = [];
+    my $activated_volumes = [];
 
     # With -blockdev, it is necessary to activate the volumes before generating the command line
     if (!$running) {
-        $volumes = get_current_vm_volumes($storecfg, $conf);
-        PVE::Storage::activate_volumes($storecfg, $volumes);
+        $activated_volumes = activate_current_vm_volumes($storecfg, $conf);
     }
 
     # There might be concurrent operations on the volumes, so do not deactivate.
-- 
2.47.3