From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 721831FF140 for ; Fri, 13 Mar 2026 14:12:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D98C5269D; Fri, 13 Mar 2026 14:12:42 +0100 (CET) From: Daniel Herzig To: pve-devel@lists.proxmox.com Subject: [RFC PATCH qemu-server 3/4] introduce sub 'activate_current_vm_volumes' Date: Fri, 13 Mar 2026 14:12:05 +0100 Message-ID: <20260313131206.277195-4-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.486 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: 3ATEBDENIU2CKF3R6UTIC6IS5KSCXTHK X-Message-ID-Hash: 3ATEBDENIU2CKF3R6UTIC6IS5KSCXTHK 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 | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 09e7a19b..a7b98e01 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -6068,6 +6068,60 @@ sub get_current_vm_volumes { return $volumes; } +=head3 activate_current_vm_volumes($storecfg, $conf, $vmid [, $statefile_volume]) +Activates VM volumes (With -blockdev, it is necessary to activate the volumes +before generating the command line). + +NOTE: If $drive->{dismissable} is specified for a CD-ROM, C<$conf> may change. +If $drive->{file} is unavailable, $drive->{file} will be set to 'none', and +the entries $drive->{size} and $drive->{format} will be deleted. +This will be written out to C<$conf>. + +=cut +sub activate_current_vm_volumes { + my ($storecfg, $conf, $vmid, $statefile_volume, $storage_hints) = @_; + my $volumes_to_be_activated = []; + my $activated_volumes = []; + + if ($statefile_volume) { + push $volumes_to_be_activated->@*, $statefile_volume; + } + PVE::QemuConfig->foreach_volume_full( + $conf, + { extra_keys => ['vmstate'] }, + sub { + my ($ds, $drive) = @_; + my $volid = $drive->{file}; + if (PVE::Storage::parse_volume_id($volid, 1)) { + check_volume_storage_type($storecfg, $volid); + if ($drive->{dismissable}) { + eval { PVE::Storage::activate_volumes($storecfg, [$volid]) }; + if ($@) { + log_warn($@); + log_warn("removing dismissable CD-ROM from VM configuration: ". $volid); + $drive->{file} = "none"; + delete $drive->{size}; + delete $drive->{format}; + $conf->{$ds} = print_drive($drive); + PVE::QemuConfig->write_config($vmid, $conf); + } else { + push $activated_volumes->@*, $volid; + } + } else { + push $volumes_to_be_activated->@*, $volid; + } + } + } + ); + eval { PVE::Storage::activate_volumes($storecfg, $volumes_to_be_activated, undef, $storage_hints) }; + if ($@) { + die $@; + } else { + push $activated_volumes->@*, $volumes_to_be_activated; + } + return $activated_volumes; +} + sub cleanup_pci_devices { my ($vmid, $conf) = @_; -- 2.47.3