[PATCH v2 qemu-server 07/16] config: add the efi-firmware option

[Christian Ludwig <christian_ludwig@genua.de>]

Add the 'efi-firmware' config key, pointing to a volume of the
efi-firmware content type. A custom firmware image does not make sense
for a legacy BIOS, so require bios=ovmf when generating the command
line.

Include the volume when activating a VM's volumes. Firmware images are
content and not owned by the VM, like ISO images, so refuse migration
unless they are on a shared storage.

Signed-off-by: Christian Ludwig <christian_ludwig@genua.de>
---
 src/PVE/QemuConfig.pm  |  2 +-
 src/PVE/QemuMigrate.pm |  2 ++
 src/PVE/QemuServer.pm  | 18 ++++++++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/PVE/QemuConfig.pm b/src/PVE/QemuConfig.pm
index 26f0fda2..1d73048a 100644
--- a/src/PVE/QemuConfig.pm
+++ b/src/PVE/QemuConfig.pm
@@ -105,7 +105,7 @@ sub parse_volume {
     my ($class, $key, $volume_string, $noerr) = @_;
 
     my $volume;
-    if ($key eq 'vmstate') {
+    if ($key eq 'vmstate' || $key eq 'efi-firmware') {
         eval { PVE::JSONSchema::check_format('pve-volume-id', $volume_string) };
         if (my $err = $@) {
             return if $noerr;
diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm
index 8da6f15d..1ccdffab 100644
--- a/src/PVE/QemuMigrate.pm
+++ b/src/PVE/QemuMigrate.pm
@@ -440,6 +440,8 @@ sub scan_local_volumes {
             $self->target_storage_check_available($storecfg, $targetsid, $volid);
             return if $scfg->{shared} && !$self->{opts}->{remote};
 
+            die "local efi-firmware image\n" if $attr->{is_firmware};
+
             $local_volumes->{$volid}->{ref} = 'pending' if $attr->{referenced_in_pending};
             $local_volumes->{$volid}->{ref} = 'snapshot' if $attr->{referenced_in_snapshot};
             $local_volumes->{$volid}->{ref} = 'unused' if $attr->{is_unused};
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 63d8c135..53b35b22 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -663,6 +663,14 @@ EODESCR
         description => "Select BIOS implementation.",
         default => 'seabios',
     },
+    'efi-firmware' => {
+        optional => 1,
+        type => 'string',
+        format => 'pve-volume-id',
+        description => "Custom EFI firmware code image (pflash0). Must be a volid "
+            . "referencing a 'efi-firmware' content type volume (e.g. "
+            . "'local:efi-firmware/custom.fd'). Requires bios=ovmf.",
+    },
     vmgenid => {
         type => 'string',
         pattern => '(?:[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}|[01])',
@@ -3255,6 +3263,9 @@ sub config_to_command {
         push @$cmd, '-smbios', "type=1" . $smbios_string;
     }
 
+    die "efi-firmware requires bios=ovmf\n"
+        if $conf->{'efi-firmware'} && (!$conf->{bios} || $conf->{bios} ne 'ovmf');
+
     if ($conf->{bios} && $conf->{bios} eq 'ovmf') {
         die "OVMF (UEFI) BIOS is not supported on 32-bit CPU types\n"
             if !$forcecpu && get_cpu_bitness($conf->{cpu}, $arch) == 32;
@@ -4568,11 +4579,14 @@ sub foreach_volid {
         $volhash->{$volid}->{is_tpmstate} //= 0;
         $volhash->{$volid}->{is_tpmstate} = 1 if $key eq 'tpmstate0';
 
+        $volhash->{$volid}->{is_firmware} //= 0;
+        $volhash->{$volid}->{is_firmware} = 1 if $key eq 'efi-firmware';
+
         $volhash->{$volid}->{drivename} = $key if is_valid_drivename($key);
     };
 
     my $include_opts = {
-        extra_keys => ['vmstate'],
+        extra_keys => ['vmstate', 'efi-firmware'],
         include_unused => 1,
     };
 
@@ -6123,7 +6137,7 @@ sub get_current_vm_volumes {
 
     PVE::QemuConfig->foreach_volume_full(
         $conf,
-        { extra_keys => ['vmstate'] },
+        { extra_keys => ['vmstate', 'efi-firmware'] },
         sub {
             my ($ds, $drive) = @_;
 
-- 
2.34.1