qemu_firmware: Prefer template format to loader format

In the vast majority of cases they will match, but it just makes
more logical sense to copy the format from the NVRAM template to
the NVRAM file itself.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index f32e46cc8c07f95f25710d35bb3c43cef317af97..b08fb95585f28b77e8fa35e9bab17484013f562c 100644 (file)
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -991,7 +991,10 @@ qemuFirmwareEnsureNVRAM(virDomainDef *def,
          * NVRAM format if that's missing though */
         if (!virStorageSourceIsEmpty(loader->nvram)) {
             if (!loader->nvram->format) {
-                loader->nvram->format = loader->format;
+                if (loader->nvramTemplateFormat)
+                    loader->nvram->format = loader->nvramTemplateFormat;
+                else
+                    loader->nvram->format = loader->format;
             }
             return;
         }