[PATCH 26/36] qemu_firmware: Prefer template format to loader format

Andrea Bolognani via Devel posted 36 patches 1 week, 3 days ago
[PATCH 26/36] qemu_firmware: Prefer template format to loader format
Posted by Andrea Bolognani via Devel 1 week, 3 days ago
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>
---
 src/qemu/qemu_firmware.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index f32e46cc8c..b08fb95585 100644
--- 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;
         }
-- 
2.52.0