From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id C59101FF16F
for <inbox@lore.proxmox.com>; Thu, 30 Jan 2025 12:32:06 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id D8BCFFAF1;
Thu, 30 Jan 2025 12:31:57 +0100 (CET)
From: Daniel Herzig <d.herzig@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 30 Jan 2025 12:31:17 +0100
Message-Id: <20250130113121.157273-3-d.herzig@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250130113121.157273-1-d.herzig@proxmox.com>
References: <20250130113121.157273-1-d.herzig@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.612 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.001 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.001 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.001 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
Subject: [pve-devel] [PATCH qemu-server v3 2/6] fix #4225: qemuserver:
introduce sub eject_nonrequired_isos
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
The function `eject_nonrequired_isos` checks on whether a cdrom drive is
marked as required for booting the VM or not. If the parameter `essential` is not
defined, it will assume `essential` to be true and keep the current
behaviour.
If `required` is set to 0, the function 'ejects' the ISO file by
setting the drive's file value to 'none', if the underlying storage is
unavailable or if the defined file is unavailable for another reason.
The function is meant to be called from `config_to_command` while it
iterates over all volumes to allow for early storage activation and
early exit in the case of missing required files or unavailable
network storages.
This commit also adds a small helper sub `file_exists` to facilitate
mocking of file existence, which is needed for testing
`eject_nonrequired_isos` once in place.
---
PVE/QemuServer.pm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 808c0e1c..d151c322 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8797,4 +8797,39 @@ sub delete_ifaces_ipams_ips {
}
}
+sub eject_nonrequired_isos {
+ my ($ds, $drive, $vmid, $storecfg, $conf) = @_;
+
+ # exclude cloudinit drives from processing (parameter '1')
+ return if ( !drive_is_cdrom($drive, 1) ||
+ $drive->{file} eq 'none' ||
+ $drive->{file} eq 'cdrom' );
+
+ $drive->{essential} = 1 if !defined($drive->{essential});
+ my $iso_volid = $drive->{file};
+ my $iso_path = PVE::QemuServer::Drive::get_iso_path($storecfg, $vmid, $iso_volid);
+ my $store_err;
+ if ($iso_volid !~ m|^/|) {
+ my $iso_storage = PVE::Storage::parse_volume_id($iso_volid, 1);
+ eval { PVE::Storage::activate_storage($storecfg, $iso_storage); };
+ $store_err = $@;
+ }
+
+ return if ( !$store_err &&
+ file_exists($iso_path) );
+
+ if ($drive->{essential}) {
+ die "'${ds}: ${iso_volid}': storage unavailable or file does not exist\n";
+ } else {
+ log_warn("eject '${ds}: ${iso_volid}': storage unavailable or file does not exist");
+ $drive->{file} = 'none';
+ $conf->{$ds} = print_drive($drive);
+ }
+}
+
+sub file_exists {
+ my $file_path = shift;
+ return -e $file_path
+}
+
1;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel