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 8494A90B57 for ; Mon, 30 Jan 2023 13:58:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6615B18066 for ; Mon, 30 Jan 2023 13:58:01 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 30 Jan 2023 13:58:00 +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 016A74548E for ; Mon, 30 Jan 2023 13:58:00 +0100 (CET) From: Matthias Heiserer To: pve-devel@lists.proxmox.com Date: Mon, 30 Jan 2023 13:57:51 +0100 Message-Id: <20230130125751.170088-1-m.heiserer@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.220 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 v2 qemu-server] api: ignore --efitype parameter when creating efidisk for ARM VM 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, 30 Jan 2023 12:58:01 -0000 Required because there's one single efi for ARM, and the 2m/4m difference doesn't seem to apply. Signed-off-by: Matthias Heiserer --- Changes from v1: Rather than change the efi type in the GUI, ignore it in the API PVE/QemuServer.pm | 2 +- PVE/QemuServer/Drive.pm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 987908d..0b81d55 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3374,7 +3374,7 @@ sub get_ovmf_files($$$) { or die "no OVMF images known for architecture '$arch'\n"; my $type = 'default'; - if (defined($efidisk->{efitype}) && $efidisk->{efitype} eq '4m') { + if ($arch ne "aarch64" && defined($efidisk->{efitype}) && $efidisk->{efitype} eq '4m') { $type = $smm ? "4m" : "4m-no-smm"; $type .= '-ms' if $efidisk->{'pre-enrolled-keys'}; } diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index 12a1fbe..9bb5e63 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -356,7 +356,8 @@ my $efidisk_fmt = { my $efidisk_desc = { optional => 1, type => 'string', format => $efidisk_fmt, - description => "Configure a Disk for storing EFI vars.", + description => "Configure a Disk for storing EFI vars." + . " When vm arch is aarch64, efitype is being ignored.", }; PVE::JSONSchema::register_standard_option("pve-qm-efidisk", $efidisk_desc); -- 2.30.2