[PATCH 07/29] qemu_firmware: Use qemuFirmwareFile in qemuFirmwareMappingMemory

[Andrea Bolognani via Devel]

Not very useful for now, but sets the stage for further changes.

Signed-off-by: Andrea Bolognani <abolo...@redhat.com>
---
 src/qemu/qemu_firmware.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index e3471d9adb..5f5550424f 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -95,7 +95,7 @@ struct _qemuFirmwareMappingFlash {
 
 typedef struct _qemuFirmwareMappingMemory qemuFirmwareMappingMemory;
 struct _qemuFirmwareMappingMemory {
-    char *filename;
+    qemuFirmwareFile executable;
 };
 
 
@@ -217,7 +217,7 @@ 
qemuFirmwareMappingFlashFreeContent(qemuFirmwareMappingFlash *flash)
 static void
 qemuFirmwareMappingMemoryFreeContent(qemuFirmwareMappingMemory *memory)
 {
-    g_free(memory->filename);
+    qemuFirmwareFileFreeContent(&memory->executable);
 }
 
 
@@ -412,7 +412,8 @@ qemuFirmwareMappingMemoryParse(const char *path,
         return -1;
     }
 
-    memory->filename = g_strdup(filename);
+    memory->executable.filename = g_strdup(filename);
+    memory->executable.format = g_strdup("raw");
 
     return 0;
 }
@@ -698,7 +699,7 @@ qemuFirmwareMappingMemoryFormat(virJSONValue *mapping,
 {
     if (virJSONValueObjectAppendString(mapping,
                                        "filename",
-                                       memory->filename) < 0)
+                                       memory->executable.filename) < 0)
         return -1;
 
     return 0;
@@ -890,7 +891,7 @@ qemuFirmwareMatchesPaths(const qemuFirmware *fw,
         break;
     case QEMU_FIRMWARE_DEVICE_MEMORY:
         if (loader && loader->path &&
-            !virFileComparePaths(loader->path, memory->filename))
+            !virFileComparePaths(loader->path, memory->executable.filename))
             return false;
         break;
     case QEMU_FIRMWARE_DEVICE_NONE:
@@ -1481,7 +1482,7 @@ qemuFirmwareEnableFeaturesModern(virDomainDef *def,
         loader->format = VIR_STORAGE_FILE_RAW;
 
         VIR_FREE(loader->path);
-        loader->path = g_strdup(memory->filename);
+        loader->path = g_strdup(memory->executable.filename);
 
         VIR_DEBUG("decided on loader '%s'",
                   loader->path);
@@ -2078,7 +2079,7 @@ qemuFirmwareGetSupported(const char *machine,
             break;
 
         case QEMU_FIRMWARE_DEVICE_MEMORY:
-            fwpath = memory->filename;
+            fwpath = memory->executable.filename;
             break;
 
         case QEMU_FIRMWARE_DEVICE_NONE:
-- 
2.52.0