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

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

[Matthias Heiserer]

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@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

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

[Thomas Lamprecht]

Am 30/01/2023 um 13:57 schrieb Matthias Heiserer:
> 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@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(-)
> 
>

applied, thanks!

But subject slightly reworded as it wasn't really in the api-specific part and
having the efitype parameter include some CLI option hyphen included is not
really useful when reading the git log. Also moved the description up to the
actual efitype format string schema, fits better there as in the whole efidisk
one - especially as this is only relevant for an unofficial niche architecture.