From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfYh-0002ay-BS for qemu-devel@nongnu.org; Wed, 27 May 2015 13:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxfYc-0002PK-ER for qemu-devel@nongnu.org; Wed, 27 May 2015 13:56:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxfYc-0002P4-9P for qemu-devel@nongnu.org; Wed, 27 May 2015 13:55:58 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id D38238EFC2 for ; Wed, 27 May 2015 17:55:57 +0000 (UTC) From: Markus Armbruster Date: Wed, 27 May 2015 19:55:53 +0200 Message-Id: <1432749355-4960-2-git-send-email-armbru@redhat.com> In-Reply-To: <1432749355-4960-1-git-send-email-armbru@redhat.com> References: <1432749355-4960-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] Revert "aml-build: fix build for glib < 2.22" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Since we now require GLib 2.22+ (commit f40685c), we don't have to work around lack of g_ptr_array_new_with_free_func() anymore. This reverts commit 2e5feadbf8133b9b108919a2f576943b448a1a06. Signed-off-by: Markus Armbruster --- hw/acpi/aml-build.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 77ce00b..65c9d00 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -301,7 +301,7 @@ static Aml *aml_bundle(uint8_t op, AmlBlockFlags flags) return var; } -static void aml_free(gpointer data, gpointer user_data) +static void aml_free(gpointer data) { Aml *var = data; build_free_array(var->buf); @@ -312,14 +312,13 @@ Aml *init_aml_allocator(void) Aml *var; assert(!alloc_list); - alloc_list = g_ptr_array_new(); + alloc_list = g_ptr_array_new_with_free_func(aml_free); 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; } -- 1.9.3