From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36976) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bID7X-0002oD-0d for qemu-devel@nongnu.org; Wed, 29 Jun 2016 06:53:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bID7V-0006mJ-4h for qemu-devel@nongnu.org; Wed, 29 Jun 2016 06:53:26 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bID7U-0006mF-U3 for qemu-devel@nongnu.org; Wed, 29 Jun 2016 06:53:25 -0400 Received: by mail-wm0-x242.google.com with SMTP id a66so13282661wme.2 for ; Wed, 29 Jun 2016 03:53:24 -0700 (PDT) Sender: Paolo Bonzini References: <1466105332-10285-1-git-send-email-marcandre.lureau@redhat.com> <1466105332-10285-2-git-send-email-marcandre.lureau@redhat.com> From: Paolo Bonzini Message-ID: Date: Wed, 29 Jun 2016 12:53:16 +0200 MIME-Version: 1.0 In-Reply-To: <1466105332-10285-2-git-send-email-marcandre.lureau@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 1/3] char: clean up remaining chardevs when leaving List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org On 16/06/2016 21:28, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > This helps to remove various chardev resources leaks when leaving qemu. > > Signed-off-by: Marc-André Lureau > --- > qemu-char.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/qemu-char.c b/qemu-char.c > index c926e9a..98dcd49 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -4541,6 +4541,15 @@ void qmp_chardev_remove(const char *id, Error **errp) > qemu_chr_delete(chr); > } > > +static void qemu_chr_cleanup(void) > +{ > + CharDriverState *chr; > + > + QTAILQ_FOREACH(chr, &chardevs, next) { > + qemu_chr_delete(chr); > + } > +} FYI, this patch is necessary on top: diff --git a/qemu-char.c b/qemu-char.c index 016badb..bc04ced 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -4551,9 +4551,9 @@ static void qemu_chr_cleanup(void) { - CharDriverState *chr; + CharDriverState *chr, *tmp; - QTAILQ_FOREACH(chr, &chardevs, next) { + QTAILQ_FOREACH_SAFE(chr, &chardevs, next, tmp) { qemu_chr_delete(chr); } } (Reproducer: start QEMU with MALLOC_PERTURB_=42 and type "quit" on the monitor). Thanks, Paolo