]> Git Repo - qemu.git/commitdiff
aml-build: fix build for glib < 2.22
authorMichael S. Tsirkin <[email protected]>
Tue, 3 Mar 2015 16:40:45 +0000 (17:40 +0100)
committerMichael S. Tsirkin <[email protected]>
Tue, 3 Mar 2015 16:42:18 +0000 (17:42 +0100)
g_ptr_array_new_with_free_func is there since glib 2.22,
use the older g_ptr_array_foreach instead.

Reported-by: Peter Maydell <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
hw/acpi/aml-build.c

index 3e5949be10c4325befb475e3470c435118d4e24f..876cada4b29072d119a82106619001387557b20a 100644 (file)
@@ -299,7 +299,7 @@ static Aml *aml_bundle(uint8_t op, AmlBlockFlags flags)
     return var;
 }
 
-static void aml_free(gpointer data)
+static void aml_free(gpointer data, gpointer user_data)
 {
     Aml *var = data;
     build_free_array(var->buf);
@@ -310,13 +310,14 @@ Aml *init_aml_allocator(void)
     Aml *var;
 
     assert(!alloc_list);
-    alloc_list = g_ptr_array_new_with_free_func(aml_free);
+    alloc_list = g_ptr_array_new();
     var = aml_alloc();
     return var;
 }
 
 void free_aml_allocator(void)
 {
+    g_ptr_array_foreach(alloc_list, aml_free, NULL);
     g_ptr_array_free(alloc_list, true);
     alloc_list = 0;
 }
This page took 0.02687 seconds and 4 git commands to generate.