[PULL 21/38] plugins: update lockstep to use g_memdup2

Alex Bennée posted 38 patches 2 years, 7 months ago
[PULL 21/38] plugins: update lockstep to use g_memdup2
Posted by Alex Bennée 2 years, 7 months ago
The old g_memdup is deprecated, use the replacement.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230630180423.558337-22-alex.bennee@linaro.org>

diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c
index e36f0b9562..3614c3564c 100644
--- a/contrib/plugins/lockstep.c
+++ b/contrib/plugins/lockstep.c
@@ -130,7 +130,7 @@ static void report_divergance(ExecState *us, ExecState *them)
         }
     }
     divergence_log = g_slist_prepend(divergence_log,
-                                     g_memdup(&divrec, sizeof(divrec)));
+                                     g_memdup2(&divrec, sizeof(divrec)));
 
     /* Output short log entry of going out of sync... */
     if (verbose || divrec.distance == 1 || diverged) {
-- 
2.39.2


Re: [PULL 21/38] plugins: update lockstep to use g_memdup2
Posted by Thomas Huth 2 years, 2 months ago
On 03/07/2023 15.44, Alex Bennée wrote:
> The old g_memdup is deprecated, use the replacement.
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20230630180423.558337-22-alex.bennee@linaro.org>
> 
> diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c
> index e36f0b9562..3614c3564c 100644
> --- a/contrib/plugins/lockstep.c
> +++ b/contrib/plugins/lockstep.c
> @@ -130,7 +130,7 @@ static void report_divergance(ExecState *us, ExecState *them)
>           }
>       }
>       divergence_log = g_slist_prepend(divergence_log,
> -                                     g_memdup(&divrec, sizeof(divrec)));
> +                                     g_memdup2(&divrec, sizeof(divrec)));
>   
>       /* Output short log entry of going out of sync... */
>       if (verbose || divrec.distance == 1 || diverged) {

FYI, this seems to trigger a compiler warning on Ubuntu 20.04:

https://app.travis-ci.com/github/huth/qemu/jobs/613144955#L1914

  Thomas


Re: [PULL 21/38] plugins: update lockstep to use g_memdup2
Posted by Alex Bennée 2 years, 2 months ago
Thomas Huth <thuth@redhat.com> writes:

> On 03/07/2023 15.44, Alex Bennée wrote:
>> The old g_memdup is deprecated, use the replacement.
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> Message-Id: <20230630180423.558337-22-alex.bennee@linaro.org>
>> diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c
>> index e36f0b9562..3614c3564c 100644
>> --- a/contrib/plugins/lockstep.c
>> +++ b/contrib/plugins/lockstep.c
>> @@ -130,7 +130,7 @@ static void report_divergance(ExecState *us, ExecState *them)
>>           }
>>       }
>>       divergence_log = g_slist_prepend(divergence_log,
>> -                                     g_memdup(&divrec, sizeof(divrec)));
>> +                                     g_memdup2(&divrec, sizeof(divrec)));
>>         /* Output short log entry of going out of sync... */
>>       if (verbose || divrec.distance == 1 || diverged) {
>
> FYI, this seems to trigger a compiler warning on Ubuntu 20.04:
>
> https://app.travis-ci.com/github/huth/qemu/jobs/613144955#L1914

Isn't 20.04 outside of our support range now? Otherwise we could add a
helper to glib-compat.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PULL 21/38] plugins: update lockstep to use g_memdup2
Posted by Thomas Huth 2 years, 2 months ago
On 13/11/2023 12.40, Alex Bennée wrote:
> Thomas Huth <thuth@redhat.com> writes:
> 
>> On 03/07/2023 15.44, Alex Bennée wrote:
>>> The old g_memdup is deprecated, use the replacement.
>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>> Message-Id: <20230630180423.558337-22-alex.bennee@linaro.org>
>>> diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c
>>> index e36f0b9562..3614c3564c 100644
>>> --- a/contrib/plugins/lockstep.c
>>> +++ b/contrib/plugins/lockstep.c
>>> @@ -130,7 +130,7 @@ static void report_divergance(ExecState *us, ExecState *them)
>>>            }
>>>        }
>>>        divergence_log = g_slist_prepend(divergence_log,
>>> -                                     g_memdup(&divrec, sizeof(divrec)));
>>> +                                     g_memdup2(&divrec, sizeof(divrec)));
>>>          /* Output short log entry of going out of sync... */
>>>        if (verbose || divrec.distance == 1 || diverged) {
>>
>> FYI, this seems to trigger a compiler warning on Ubuntu 20.04:
>>
>> https://app.travis-ci.com/github/huth/qemu/jobs/613144955#L1914
> 
> Isn't 20.04 outside of our support range now? Otherwise we could add a
> helper to glib-compat.

It's "Support for the previous major version will be dropped 2 years after 
the new major version is released", so we claim to support 20.04 until 2024 
(since the "new major version" has been released in 2022).

  Thomas


Re: [PULL 21/38] plugins: update lockstep to use g_memdup2
Posted by Daniel P. Berrangé 2 years, 2 months ago
On Mon, Nov 13, 2023 at 11:40:18AM +0000, Alex Bennée wrote:
> Thomas Huth <thuth@redhat.com> writes:
> 
> > On 03/07/2023 15.44, Alex Bennée wrote:
> >> The old g_memdup is deprecated, use the replacement.
> >> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> >> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> >> Message-Id: <20230630180423.558337-22-alex.bennee@linaro.org>
> >> diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c
> >> index e36f0b9562..3614c3564c 100644
> >> --- a/contrib/plugins/lockstep.c
> >> +++ b/contrib/plugins/lockstep.c
> >> @@ -130,7 +130,7 @@ static void report_divergance(ExecState *us, ExecState *them)
> >>           }
> >>       }
> >>       divergence_log = g_slist_prepend(divergence_log,
> >> -                                     g_memdup(&divrec, sizeof(divrec)));
> >> +                                     g_memdup2(&divrec, sizeof(divrec)));
> >>         /* Output short log entry of going out of sync... */
> >>       if (verbose || divrec.distance == 1 || diverged) {
> >
> > FYI, this seems to trigger a compiler warning on Ubuntu 20.04:
> >
> > https://app.travis-ci.com/github/huth/qemu/jobs/613144955#L1914
> 
> Isn't 20.04 outside of our support range now? Otherwise we could add a
> helper to glib-compat.

We're still in the 2 year overlap since 22.04 was released, so 20.04 will
remain a target until April next year.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|