[PATCH v4 03/36] qemu_firmware: Only set format for custom loader if path is present

Andrea Bolognani via Devel posted 36 patches 1 week ago
[PATCH v4 03/36] qemu_firmware: Only set format for custom loader if path is present
Posted by Andrea Bolognani via Devel 1 week ago
We only set the template format if the template path is present,
and we should be consistent with that. The format on its own is
not very interesting anyway.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/qemu/qemu_firmware.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index 436b06c388..519828f6f9 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -1662,8 +1662,10 @@ qemuFirmwareFillDomainCustom(virDomainDef *def)
     if (!loader)
         return;
 
-    if (!loader->format)
+    if (loader->path &&
+        !loader->format) {
         loader->format = VIR_STORAGE_FILE_RAW;
+    }
 
     if (loader->nvramTemplate &&
         !loader->nvramTemplateFormat) {
-- 
2.53.0