david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "target-arm: Avoid g_hash_table_get_keys()"

Browse Source 
Since we now require GLib 2.22+ (commit f40685c), we don't have to
work around lack of g_hash_table_get_keys() anymore.

This reverts commit 82a3a11897308b606120f7235001e87809708f85.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1432749090-4698-1-git-send-email-armbru@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Markus Armbruster 2015-06-02 14:56:22 +01:00 committed by Peter Maydell
parent 8742d49d6f
commit 57b6d95eb4
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target-arm/helper.c
View File

@ -294,23 +294,15 @@ static gint cpreg_key_compare(gconstpointer a, gconstpointer b)
return 0; return 0;
} }
static void cpreg_make_keylist(gpointer key, gpointer value, gpointer udata)
{
GList **plist = udata;
*plist = g_list_prepend(*plist, key);
}
void init_cpreg_list(ARMCPU *cpu) void init_cpreg_list(ARMCPU *cpu)
{ {
/* Initialise the cpreg_tuples[] array based on the cp_regs hash. /* Initialise the cpreg_tuples[] array based on the cp_regs hash.
* Note that we require cpreg_tuples[] to be sorted by key ID. * Note that we require cpreg_tuples[] to be sorted by key ID.
*/ */
GList *keys = NULL; GList *keys;
int arraylen; int arraylen;
g_hash_table_foreach(cpu->cp_regs, cpreg_make_keylist, &keys); keys = g_hash_table_get_keys(cpu->cp_regs);
keys = g_list_sort(keys, cpreg_key_compare); keys = g_list_sort(keys, cpreg_key_compare);
cpu->cpreg_array_len = 0; cpu->cpreg_array_len = 0;