From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <w.bumiller@proxmox.com>
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 57E799485F
for <pve-devel@lists.proxmox.com>; Fri, 13 Jan 2023 11:20:07 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 393313ECB
for <pve-devel@lists.proxmox.com>; Fri, 13 Jan 2023 11:20:07 +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 <pve-devel@lists.proxmox.com>; Fri, 13 Jan 2023 11:20:06 +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 58AA4448D9
for <pve-devel@lists.proxmox.com>; Fri, 13 Jan 2023 11:20:06 +0100 (CET)
Date: Fri, 13 Jan 2023 11:20:05 +0100
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Noel Ullreich <n.ullreich@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Message-ID: <20230113102005.4atiwq4jx3pdw2bg@fwblub>
References: <20230112105702.26599-1-n.ullreich@proxmox.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230112105702.26599-1-n.ullreich@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.210 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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [qemuserver.pm]
Subject: Re: [pve-devel] [PATCH qemu-server v2] 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 <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>
X-List-Received-Date: Fri, 13 Jan 2023 10:20:07 -0000
On Thu, Jan 12, 2023 at 11:57:02AM +0100, Noel Ullreich wrote:
> 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 <n.ullreich@proxmox.com>
> ---
> 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
>
> PVE/QemuServer.pm | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index d94fe5a..cfdd2b2 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -3522,7 +3522,7 @@ 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;
> + die "EFI base image '$ovmf_code' not found\n" if ! -f $ovmf_code;
I agree with Thomas' v1 reply that these checks can just happen once
directly in `get_ovmf_files` for both files, even if we don't always
fetch both paths, since in practice you either need both or none
available anyway, and under normal circumstances they won't be missing
anyway.
Can you please move them?
>
> my $var_drive_str = "if=pflash,unit=1,id=drive-efidisk0";
> if ($d) {
> @@ -8070,7 +8070,7 @@ 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;
> + die "EFI vars image '$ovmf_vars' not found\n" if ! -f $ovmf_vars;
> return -s $ovmf_vars;
> }
>
> @@ -8098,7 +8098,7 @@ 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;
> + die "EFI vars default image '$ovmf_vars' 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