From: Kohei Tokunaga Date: Mon, 28 Apr 2025 06:38:53 +0000 (+0900) Subject: target/arm/helper.c: Fix type conflict of GLib function pointers X-Git-Tag: v10.1.0-rc0~101^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44d3ec593b0afd2f8cfaf2ba2149465ee3541695;p=thirdparty%2Fqemu.git target/arm/helper.c: Fix type conflict of GLib function pointers On Emscripten, function pointer casts can result in runtime failures due to strict function signature checks. This affects the use of g_list_sort and g_slist_sort, which internally perform function pointer casts that are not supported by Emscripten. To avoid these issues, g_list_sort_with_data and g_slist_sort_with_data should be used instead, as they do not rely on function pointer casting. Signed-off-by: Kohei Tokunaga Link: https://lore.kernel.org/r/7d56c82382e8b4f1694b6d7883b2ce3084fdc72d.1745820062.git.ktokunaga.mail@gmail.com Signed-off-by: Paolo Bonzini --- diff --git a/target/arm/helper.c b/target/arm/helper.c index 7fb6e886306..c7ff9f657ca 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -222,7 +222,7 @@ static void count_cpreg(gpointer key, gpointer opaque) } } -static gint cpreg_key_compare(gconstpointer a, gconstpointer b) +static gint cpreg_key_compare(gconstpointer a, gconstpointer b, gpointer d) { uint64_t aidx = cpreg_to_kvm_id((uintptr_t)a); uint64_t bidx = cpreg_to_kvm_id((uintptr_t)b); @@ -246,7 +246,7 @@ void init_cpreg_list(ARMCPU *cpu) int arraylen; keys = g_hash_table_get_keys(cpu->cp_regs); - keys = g_list_sort(keys, cpreg_key_compare); + keys = g_list_sort_with_data(keys, cpreg_key_compare, NULL); cpu->cpreg_array_len = 0;