From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKLyw-00020y-AB for qemu-devel@nongnu.org; Wed, 29 Jul 2015 03:40:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZKLyr-00027M-R9 for qemu-devel@nongnu.org; Wed, 29 Jul 2015 03:40:54 -0400 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:38854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZKLyr-00026x-Jf for qemu-devel@nongnu.org; Wed, 29 Jul 2015 03:40:49 -0400 Received: by wibxm9 with SMTP id xm9so13501742wib.1 for ; Wed, 29 Jul 2015 00:40:49 -0700 (PDT) Sender: Paolo Bonzini References: <1438043577-28636-1-git-send-email-marcandre.lureau@redhat.com> <1438043577-28636-2-git-send-email-marcandre.lureau@redhat.com> From: Paolo Bonzini Message-ID: <55B8837E.1080202@redhat.com> Date: Wed, 29 Jul 2015 09:40:46 +0200 MIME-Version: 1.0 In-Reply-To: <1438043577-28636-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 01/45] char: add qemu_chr_free() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , qemu-devel@nongnu.org Cc: drjones@redhat.com, cam@cs.ualberta.ca, =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , stefanha@redhat.com On 28/07/2015 02:32, Marc-André Lureau wrote: > From: Marc-André Lureau > > If a chardev is allowed to be created outside of QMP, then it must be > also possible to free it. This is useful for ivshmem that creates > chardev anonymously and must be able to free them. > > Signed-off-by: Marc-André Lureau > --- > include/sysemu/char.h | 10 +++++++++- > qemu-char.c | 9 +++++++-- > 2 files changed, 16 insertions(+), 3 deletions(-) > > diff --git a/include/sysemu/char.h b/include/sysemu/char.h > index 832b7fe..5fd0a09 100644 > --- a/include/sysemu/char.h > +++ b/include/sysemu/char.h > @@ -128,11 +128,19 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename, > /** > * @qemu_chr_delete: > * > - * Destroy a character backend. > + * Destroy a character backend and remove it from the list of > + * identified character backends. > */ > void qemu_chr_delete(CharDriverState *chr); > > /** > + * @qemu_chr_free: > + * > + * Destroy a character backend. > + */ > +void qemu_chr_free(CharDriverState *chr); > + > +/** > * @qemu_chr_fe_set_echo: > * > * Ask the backend to override its normal echo setting. This only really > diff --git a/qemu-char.c b/qemu-char.c > index d956f8d..13e302b 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -3843,9 +3843,8 @@ void qemu_chr_fe_release(CharDriverState *s) > s->avail_connections++; > } > > -void qemu_chr_delete(CharDriverState *chr) > +void qemu_chr_free(CharDriverState *chr) > { > - QTAILQ_REMOVE(&chardevs, chr, next); > if (chr->chr_close) { > chr->chr_close(chr); > } > @@ -3855,6 +3854,12 @@ void qemu_chr_delete(CharDriverState *chr) > g_free(chr); > } > > +void qemu_chr_delete(CharDriverState *chr) > +{ > + QTAILQ_REMOVE(&chardevs, chr, next); > + qemu_chr_free(chr); > +} > + > ChardevInfoList *qmp_query_chardev(Error **errp) > { > ChardevInfoList *chr_list = NULL; > Acked-by: Paolo Bonzini