[v1] Fix 32-bit build for plugins

[PATCH 06/13] tests/tcg/plugins/mem: fix 32-bit build

Posted by Pierrick Bouvier 3 months, 3 weeks ago

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 tests/tcg/plugins/mem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/tcg/plugins/mem.c b/tests/tcg/plugins/mem.c
index b0fa8a9f277..d87d6628e09 100644
--- a/tests/tcg/plugins/mem.c
+++ b/tests/tcg/plugins/mem.c
@@ -135,14 +135,14 @@ static void update_region_info(uint64_t region, uint64_t offset,
     g_assert(offset + size <= region_size);
 
     g_mutex_lock(&lock);
-    ri = (RegionInfo *) g_hash_table_lookup(regions, GUINT_TO_POINTER(region));
+    ri = (RegionInfo *) g_hash_table_lookup(regions, &region);
 
     if (!ri) {
         ri = g_new0(RegionInfo, 1);
         ri->region_address = region;
         ri->data = g_malloc0(region_size);
         ri->seen_all = true;
-        g_hash_table_insert(regions, GUINT_TO_POINTER(region), (gpointer) ri);
+        g_hash_table_insert(regions, &ri->region_address, ri);
     }
 
     if (is_store) {
@@ -392,7 +392,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
 
     if (do_region_summary) {
         region_mask = (region_size - 1);
-        regions = g_hash_table_new(NULL, g_direct_equal);
+        regions = g_hash_table_new(g_int64_hash, g_int64_equal);
     }
 
     counts = qemu_plugin_scoreboard_new(sizeof(CPUCount));
-- 
2.39.5

Re: [PATCH 06/13] tests/tcg/plugins/mem: fix 32-bit build

Posted by Richard Henderson 3 months, 3 weeks ago

On 12/16/24 19:07, Pierrick Bouvier wrote:
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
>   tests/tcg/plugins/mem.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

> 
> diff --git a/tests/tcg/plugins/mem.c b/tests/tcg/plugins/mem.c
> index b0fa8a9f277..d87d6628e09 100644
> --- a/tests/tcg/plugins/mem.c
> +++ b/tests/tcg/plugins/mem.c
> @@ -135,14 +135,14 @@ static void update_region_info(uint64_t region, uint64_t offset,
>       g_assert(offset + size <= region_size);
>   
>       g_mutex_lock(&lock);
> -    ri = (RegionInfo *) g_hash_table_lookup(regions, GUINT_TO_POINTER(region));
> +    ri = (RegionInfo *) g_hash_table_lookup(regions, &region);
>   
>       if (!ri) {
>           ri = g_new0(RegionInfo, 1);
>           ri->region_address = region;
>           ri->data = g_malloc0(region_size);
>           ri->seen_all = true;
> -        g_hash_table_insert(regions, GUINT_TO_POINTER(region), (gpointer) ri);
> +        g_hash_table_insert(regions, &ri->region_address, ri);
>       }
>   
>       if (is_store) {
> @@ -392,7 +392,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
>   
>       if (do_region_summary) {
>           region_mask = (region_size - 1);
> -        regions = g_hash_table_new(NULL, g_direct_equal);
> +        regions = g_hash_table_new(g_int64_hash, g_int64_equal);
>       }
>   
>       counts = qemu_plugin_scoreboard_new(sizeof(CPUCount));