proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-01 19:19:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ovmf efi disk: ignore efitype parameter for ARM VMs

Browse Source 
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>
 [ T: move description to format and reword subject ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Matthias Heiserer 2023-01-30 13:57:51 +01:00 committed by Thomas Lamprecht
parent 72a5a17610
commit 1183c8f1a0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/QemuServer.pm
View File

@ -3391,7 +3391,7 @@ sub get_ovmf_files($$$) {
or die "no OVMF images known for architecture '$arch'\n"; or die "no OVMF images known for architecture '$arch'\n";
my $type = 'default'; 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 = $smm ? "4m" : "4m-no-smm";
$type .= '-ms' if $efidisk->{'pre-enrolled-keys'}; $type .= '-ms' if $efidisk->{'pre-enrolled-keys'};
} }

4
PVE/QemuServer/Drive.pm
View File

@ -319,7 +319,7 @@ my %efitype_fmt = (
enum => [qw(2m 4m)], enum => [qw(2m 4m)],
description => "Size and type of the OVMF EFI vars. '4m' is newer and recommended," description => "Size and type of the OVMF EFI vars. '4m' is newer and recommended,"
. " and required for Secure Boot. For backwards compatibility, '2m' is used" . " and required for Secure Boot. For backwards compatibility, '2m' is used"
. " if not otherwise specified.", . " if not otherwise specified. Ignored for VMs with arch=aarc64 (ARM).",
optional => 1, optional => 1,
default => '2m', default => '2m',
}, },
@ -356,7 +356,7 @@ my $efidisk_fmt = {
my $efidisk_desc = { my $efidisk_desc = {
optional => 1, optional => 1,
type => 'string', format => $efidisk_fmt, type => 'string', format => $efidisk_fmt,
description => "Configure a Disk for storing EFI vars.", description => "Configure a disk for storing EFI vars.",
}; };
PVE::JSONSchema::register_standard_option("pve-qm-efidisk", $efidisk_desc); PVE::JSONSchema::register_standard_option("pve-qm-efidisk", $efidisk_desc);