From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EC6AF94E19 for ; Mon, 16 Jan 2023 15:24:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDE4627B10 for ; Mon, 16 Jan 2023 15:24:23 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 16 Jan 2023 15:24:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5568A42A4C for ; Mon, 16 Jan 2023 15:24:22 +0100 (CET) From: Noel Ullreich To: pve-devel@lists.proxmox.com Date: Mon, 16 Jan 2023 15:24:10 +0100 Message-Id: <20230116142410.91511-1-n.ullreich@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.122 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v3] fix #4378: standardized error for ovmf files X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2023 14:24:24 -0000 The error messages for missing OVMF_CODE and OVMF_VARS files were inconsistent as well as the error for the missing base var file not telling you the expected path. Signed-off-by: Noel Ullreich --- changes from v1: * rebased to account for move from sub config_to_command to sub print_ovmf_drive_commandlines * left out check for existing EFI vars image in sub config_to_command since it was redundant changes from v2: * moved all checks to single sub get_ovmf_files PVE/QemuServer.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index f4b15fd..b18c64e 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3379,7 +3379,11 @@ sub get_ovmf_files($$$) { $type .= '-ms' if $efidisk->{'pre-enrolled-keys'}; } - return $types->{$type}->@*; + my ($ovmf_code, $ovmf_vars) = $types->{$type}->@*; + die "EFI base image '$ovmf_code' not found\n" if ! -f $ovmf_code; + die "EFI vars image '$ovmf_vars' not found\n" if ! -f $ovmf_vars; + + return ($ovmf_code, $ovmf_vars); } my $Arch2Qemu = { @@ -3528,7 +3532,6 @@ my sub print_ovmf_drive_commandlines { my $d = $conf->{efidisk0} ? parse_drive('efidisk0', $conf->{efidisk0}) : undef; my ($ovmf_code, $ovmf_vars) = get_ovmf_files($arch, $d, $q35); - die "uefi base image '$ovmf_code' not found\n" if ! -f $ovmf_code; my $var_drive_str = "if=pflash,unit=1,id=drive-efidisk0"; if ($d) { @@ -8076,7 +8079,6 @@ sub get_efivars_size { $efidisk //= $conf->{efidisk0} ? parse_drive('efidisk0', $conf->{efidisk0}) : undef; my $smm = PVE::QemuServer::Machine::machine_type_is_q35($conf); my (undef, $ovmf_vars) = get_ovmf_files($arch, $efidisk, $smm); - die "uefi vars image '$ovmf_vars' not found\n" if ! -f $ovmf_vars; return -s $ovmf_vars; } @@ -8104,7 +8106,6 @@ sub create_efidisk($$$$$$$) { my ($storecfg, $storeid, $vmid, $fmt, $arch, $efidisk, $smm) = @_; my (undef, $ovmf_vars) = get_ovmf_files($arch, $efidisk, $smm); - die "EFI vars default image not found\n" if ! -f $ovmf_vars; my $vars_size_b = -s $ovmf_vars; my $vars_size = PVE::Tools::convert_size($vars_size_b, 'b' => 'kb'); -- 2.30.2