bhyve: autofill NVRAM data for firmware='efi'

When a domain configured with "<os firmware='efi'/>", autofill not only
loader/firmware configuration, but also nvram.

This also fixes the `scripts/domain/405-ovmf-nvram-efi.t` test in
libvirt-tck for bhyve.

Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/bhyve/bhyve_firmware.c b/src/bhyve/bhyve_firmware.c
index 36bca490b6a2bc6a028389435bc83583e14b80ff..57ad0031b0336fd57401945908044b1db6bd11f6 100644 (file)
--- a/src/bhyve/bhyve_firmware.c
+++ b/src/bhyve/bhyve_firmware.c
@@ -72,8 +72,9 @@ bhyveFirmwareEnsureNVRAM(virDomainDef *def,
         /* otherwise we want to reset and re-populate the definition */
         virObjectUnref(loader->nvram);
     } else {
         /* otherwise we want to reset and re-populate the definition */
         virObjectUnref(loader->nvram);
     } else {

-        /* Also do nothing if NVRAM is not requested */
-        return;
+        /* Only add nvram for "<os firmware='efi'/>" */
+        if (def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_EFI)
+            return;

     }
 
     loader->nvram = virStorageSourceNew();
     }
 
     loader->nvram = virStorageSourceNew();

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
index c87dc7d77946b4cbbd549a3c82757e55c26f80a1..16b9c50535a38804017157ac856285d1a48919d7 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
@@ -5,7 +5,7 @@ bhyve \
 -H \
 -P \
 -s 0:0,hostbridge \
 -H \
 -P \
 -s 0:0,hostbridge \

--l bootrom,fakefirmwaredir/BHYVE_UEFI.fd \
+-l bootrom,fakefirmwaredir/BHYVE_UEFI.fd,fakenvramdir/bhyve_VARS.fd \

 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \