[Qemu-devel] [PATCH 18/25] fixup! acpi: simplify bios_linker API by removing redundant 'table' argument

[Igor Mammedov]

replace glib 2.32 g_array_set_clear_func() with a manual
cleanup loop

Signed-off-by: Igor Mammedov <address@hidden>
---
 hw/acpi/bios-linker-loader.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/hw/acpi/bios-linker-loader.c b/hw/acpi/bios-linker-loader.c
index a2f20ec..8e3f30d 100644
--- a/hw/acpi/bios-linker-loader.c
+++ b/hw/acpi/bios-linker-loader.c
@@ -105,12 +105,6 @@ typedef struct BiosLinkerFileEntry {
     GArray *blob; /* data accosiated with @name */
 } BiosLinkerFileEntry;
 
-static void bios_linker_free_file_entry(gpointer data)
-{
-    BiosLinkerFileEntry *entry = data;
-    g_free(entry->name);
-}
-
 /*
  * bios_linker_loader_init: allocate a new linker object instance.
  *
@@ -124,15 +118,20 @@ BIOSLinker *bios_linker_loader_init(void)
     linker->cmd_blob = g_array_new(false, true /* clear */, 1);
     linker->file_list = g_array_new(false, true /* clear */,
                                     sizeof(BiosLinkerFileEntry));
-    g_array_set_clear_func(linker->file_list, bios_linker_free_file_entry);
     return linker;
 }
 
 /* Free linker wrapper and return the linker commands array. */
 void *bios_linker_loader_cleanup(BIOSLinker *linker)
 {
+    int i;
+    BiosLinkerFileEntry *entry;
     void *cmd_blob = g_array_free(linker->cmd_blob, false);
 
+    for (i = 0; i < linker->file_list->len; i++) {
+        entry = &g_array_index(linker->file_list, BiosLinkerFileEntry, i);
+        g_free(entry->name);
+    }
     g_array_free(linker->file_list, true);
     g_free(linker);
     return cmd_blob;
-- 
1.8.3.1