From 3c1cba63dc5070ab559a126e206557f27fbaea59 Mon Sep 17 00:00:00 2001
From: Aarushi Mehta <mehta.aaru20@gmail.com>
Date: Sat, 2 Mar 2019 01:11:42 +0530
Subject: [PATCH v4] thunk: fix of malloc to g_new

Note that since thunking occurs throughout the lifetime of the QEMU
instance, there is no matching 'free' to correct.

Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 thunk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thunk.c b/thunk.c
index d5d8645cd4..17f3d320bb 100644
--- a/thunk.c
+++ b/thunk.c
@@ -89,7 +89,7 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
     for(i = 0;i < 2; i++) {
         offset = 0;
         max_align = 1;
-        se->field_offsets[i] = malloc(nb_fields * sizeof(int));
+        se->field_offsets[i] = g_new(int, nb_fields);
         type_ptr = se->field_types;
         for(j = 0;j < nb_fields; j++) {
             size = thunk_type_size(type_ptr, i);
-- 
2.17.1

On Sat, Mar 02, 2019 at 01:22:29AM +0530, Aarushi Mehta wrote:
> From 3c1cba63dc5070ab559a126e206557f27fbaea59 Mon Sep 17 00:00:00 2001
> From: Aarushi Mehta <mehta.aaru20@gmail.com>
> Date: Sat, 2 Mar 2019 01:11:42 +0530
> Subject: [PATCH v4] thunk: fix of malloc to g_new
> 
> Note that since thunking occurs throughout the lifetime of the QEMU
> instance, there is no matching 'free' to correct.
> 
> Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  thunk.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Riku: Will you send a pull request?  Otherwise Peter might be willing to
merge this patch through his tree.

> diff --git a/thunk.c b/thunk.c
> index d5d8645cd4..17f3d320bb 100644
> --- a/thunk.c
> +++ b/thunk.c
> @@ -89,7 +89,7 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
>      for(i = 0;i < 2; i++) {
>          offset = 0;
>          max_align = 1;
> -        se->field_offsets[i] = malloc(nb_fields * sizeof(int));
> +        se->field_offsets[i] = g_new(int, nb_fields);
>          type_ptr = se->field_types;
>          for(j = 0;j < nb_fields; j++) {
>              size = thunk_type_size(type_ptr, i);
> -- 
> 2.17.1
> 
> 

On 06/03/2019 10:56, Stefan Hajnoczi wrote:
> On Sat, Mar 02, 2019 at 01:22:29AM +0530, Aarushi Mehta wrote:
>> From 3c1cba63dc5070ab559a126e206557f27fbaea59 Mon Sep 17 00:00:00 2001
>> From: Aarushi Mehta <mehta.aaru20@gmail.com>
>> Date: Sat, 2 Mar 2019 01:11:42 +0530
>> Subject: [PATCH v4] thunk: fix of malloc to g_new
>>
>> Note that since thunking occurs throughout the lifetime of the QEMU
>> instance, there is no matching 'free' to correct.
>>
>> Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com>
>> Reviewed-by: Eric Blake <eblake@redhat.com>
>> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
>> ---
>>  thunk.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Riku: Will you send a pull request?  Otherwise Peter might be willing to
> merge this patch through his tree.
> 

I can take this through the trivial patches branch.

Thanks,
Laurent