[pve-devel] [PATCH v2 qemu-server] api: ignore --efitype parameter when creating efidisk for ARM VM

Matthias Heiserer m.heiserer at proxmox.com
Mon Jan 30 13:57:51 CET 2023


Required because there's one single efi for ARM, and
the 2m/4m difference doesn't seem to apply.

Signed-off-by: Matthias Heiserer <m.heiserer at proxmox.com>
---

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






More information about the pve-devel mailing list