* [PATCH v2] audio: Free consumed default audio devices
@ 2023-11-20 11:28 Akihiko Odaki
2023-11-20 11:35 ` Marc-André Lureau
2023-11-20 21:20 ` Paolo Bonzini
0 siblings, 2 replies; 4+ messages in thread
From: Akihiko Odaki @ 2023-11-20 11:28 UTC (permalink / raw)
Cc: Akihiko Odaki, Gerd Hoffmann, Marc-André Lureau, qemu-devel
Failed default audio devices were removed from the list but not freed,
and that made LeakSanitizer sad. Free default audio devices as they are
consumed.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
V1 -> V2: Set s->dev NULL after free (Marc-André Lureau)
audio/audio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/audio/audio.c b/audio/audio.c
index f91e05b72c..8d1e4ad922 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -1758,12 +1758,15 @@ static AudioState *audio_init(Audiodev *dev, Error **errp)
goto out;
}
s->dev = dev = e->dev;
+ QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
+ g_free(e);
drvname = AudiodevDriver_str(dev->driver);
driver = audio_driver_lookup(drvname);
if (!audio_driver_init(s, driver, dev, NULL)) {
break;
}
- QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
+ qapi_free_Audiodev(dev);
+ s->dev = NULL;
}
}
--
2.42.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] audio: Free consumed default audio devices
2023-11-20 11:28 [PATCH v2] audio: Free consumed default audio devices Akihiko Odaki
@ 2023-11-20 11:35 ` Marc-André Lureau
2023-11-20 11:53 ` Akihiko Odaki
2023-11-20 21:20 ` Paolo Bonzini
1 sibling, 1 reply; 4+ messages in thread
From: Marc-André Lureau @ 2023-11-20 11:35 UTC (permalink / raw)
To: Akihiko Odaki; +Cc: Gerd Hoffmann, qemu-devel
Hi
On Mon, Nov 20, 2023 at 3:29 PM Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>
> Failed default audio devices were removed from the list but not freed,
> and that made LeakSanitizer sad. Free default audio devices as they are
> consumed.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> V1 -> V2: Set s->dev NULL after free (Marc-André Lureau)
>
> audio/audio.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index f91e05b72c..8d1e4ad922 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -1758,12 +1758,15 @@ static AudioState *audio_init(Audiodev *dev, Error **errp)
> goto out;
> }
> s->dev = dev = e->dev;
> + QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
> + g_free(e);
> drvname = AudiodevDriver_str(dev->driver);
> driver = audio_driver_lookup(drvname);
> if (!audio_driver_init(s, driver, dev, NULL)) {
Maybe it would be clearer/safer to set s->dev in audio_driver_init() on success.
> break;
> }
> - QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
> + qapi_free_Audiodev(dev);
> + s->dev = NULL;
> }
> }
>
> --
> 2.42.1
>
>
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] audio: Free consumed default audio devices
2023-11-20 11:35 ` Marc-André Lureau
@ 2023-11-20 11:53 ` Akihiko Odaki
0 siblings, 0 replies; 4+ messages in thread
From: Akihiko Odaki @ 2023-11-20 11:53 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: Gerd Hoffmann, qemu-devel
On 2023/11/20 20:35, Marc-André Lureau wrote:
> Hi
>
> On Mon, Nov 20, 2023 at 3:29 PM Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>>
>> Failed default audio devices were removed from the list but not freed,
>> and that made LeakSanitizer sad. Free default audio devices as they are
>> consumed.
>>
>> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
>
> Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
>> ---
>> V1 -> V2: Set s->dev NULL after free (Marc-André Lureau)
>>
>> audio/audio.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/audio/audio.c b/audio/audio.c
>> index f91e05b72c..8d1e4ad922 100644
>> --- a/audio/audio.c
>> +++ b/audio/audio.c
>> @@ -1758,12 +1758,15 @@ static AudioState *audio_init(Audiodev *dev, Error **errp)
>> goto out;
>> }
>> s->dev = dev = e->dev;
>> + QSIMPLEQ_REMOVE_HEAD(&default_audiodevs, next);
>> + g_free(e);
>> drvname = AudiodevDriver_str(dev->driver);
>> driver = audio_driver_lookup(drvname);
>> if (!audio_driver_init(s, driver, dev, NULL)) {
>
> Maybe it would be clearer/safer to set s->dev in audio_driver_init() on success.
I considered that too, but I decided not to that because
audio_driver_init() takes s and may expect s->dev is initialized.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] audio: Free consumed default audio devices
2023-11-20 11:28 [PATCH v2] audio: Free consumed default audio devices Akihiko Odaki
2023-11-20 11:35 ` Marc-André Lureau
@ 2023-11-20 21:20 ` Paolo Bonzini
1 sibling, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2023-11-20 21:20 UTC (permalink / raw)
To: Akihiko Odaki; +Cc: Gerd Hoffmann, Marc-André Lureau, qemu-devel
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-11-20 21:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-20 11:28 [PATCH v2] audio: Free consumed default audio devices Akihiko Odaki
2023-11-20 11:35 ` Marc-André Lureau
2023-11-20 11:53 ` Akihiko Odaki
2023-11-20 21:20 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).