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 222881FF140 for ; Fri, 13 Mar 2026 14:12:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2450F27A4; Fri, 13 Mar 2026 14:12:44 +0100 (CET) From: Daniel Herzig To: pve-devel@lists.proxmox.com Subject: [RFC PATCH qemu-server 4/4] integrate new sub 'activate_current_vm_volumes' Date: Fri, 13 Mar 2026 14:12:06 +0100 Message-ID: <20260313131206.277195-5-d.herzig@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260313131206.277195-1-d.herzig@proxmox.com> References: <20260313131206.277195-1-d.herzig@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -1.501 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.408 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.819 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.903 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: XVGDY6JAN4WZVKXBG6KBNIZ4X2B4EITR X-Message-ID-Hash: XVGDY6JAN4WZVKXBG6KBNIZ4X2B4EITR X-MailFrom: dherzig@emma.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: Signed-off-by: Daniel Herzig --- 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