From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYbCW-0000Tx-66 for qemu-devel@nongnu.org; Tue, 31 Jan 2017 11:22:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYbCS-0000y3-8q for qemu-devel@nongnu.org; Tue, 31 Jan 2017 11:22:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cYbCS-0000wr-2l for qemu-devel@nongnu.org; Tue, 31 Jan 2017 11:22:32 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 31 Jan 2017 20:20:57 +0400 Message-Id: <20170131162122.29408-17-marcandre.lureau@redhat.com> In-Reply-To: <20170131162122.29408-1-marcandre.lureau@redhat.com> References: <20170131162122.29408-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 16/41] char: remove chr_free List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Now it uses Object instance_finalize instead. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- include/sysemu/char.h | 8 -------- qemu-char.c | 10 +--------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/include/sysemu/char.h b/include/sysemu/char.h index da0e7dd494..5e5594f305 100644 --- a/include/sysemu/char.h +++ b/include/sysemu/char.h @@ -185,13 +185,6 @@ Chardev *qemu_chr_new_noreplay(const char *label, co= nst char *filename); void qemu_chr_delete(Chardev *chr); =20 /** - * @qemu_chr_free: - * - * Destroy a character backend. - */ -void qemu_chr_free(Chardev *chr); - -/** * @qemu_chr_fe_set_echo: * * Ask the backend to override its normal echo setting. This only reall= y @@ -496,7 +489,6 @@ typedef struct ChardevClass { int (*set_msgfds)(Chardev *s, int *fds, int num); int (*chr_add_client)(Chardev *chr, int fd); int (*chr_wait_connected)(Chardev *chr, Error **errp); - void (*chr_free)(Chardev *chr); void (*chr_disconnect)(Chardev *chr); void (*chr_accept_input)(Chardev *chr); void (*chr_set_echo)(Chardev *chr, bool echo); diff --git a/qemu-char.c b/qemu-char.c index 3d0d690999..c239418c25 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -4371,18 +4371,10 @@ void qemu_chr_fe_disconnect(CharBackend *be) } } =20 -void qemu_chr_free(Chardev *chr) -{ - if (CHARDEV_GET_CLASS(chr)->chr_free) { - CHARDEV_GET_CLASS(chr)->chr_free(chr); - } - object_unref(OBJECT(chr)); -} - void qemu_chr_delete(Chardev *chr) { QTAILQ_REMOVE(&chardevs, chr, next); - qemu_chr_free(chr); + object_unref(OBJECT(chr)); } =20 ChardevInfoList *qmp_query_chardev(Error **errp) --=20 2.11.0.295.gd7dffce1c.dirty