From 980d0414ce63ac61288c8b56a52729e64fd011a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 8 Dec 2016 16:48:15 +0300 Subject: [PATCH] mux: convert to finalize MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake --- qemu-char.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 6b4a299702..91ca4cb083 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -859,9 +859,9 @@ static GSource *mux_chr_add_watch(Chardev *s, GIOCondition cond) return cc->chr_add_watch(chr, cond); } -static void mux_chr_free(struct Chardev *chr) +static void char_mux_finalize(Object *obj) { - MuxChardev *d = MUX_CHARDEV(chr); + MuxChardev *d = MUX_CHARDEV(obj); int i; for (i = 0; i < d->mux_cnt; i++) { @@ -4025,7 +4025,6 @@ static void char_mux_class_init(ObjectClass *oc, void *data) ChardevClass *cc = CHARDEV_CLASS(oc); cc->open = qemu_chr_open_mux; - cc->chr_free = mux_chr_free; cc->chr_write = mux_chr_write; cc->chr_accept_input = mux_chr_accept_input; cc->chr_add_watch = mux_chr_add_watch; @@ -4036,6 +4035,7 @@ static const TypeInfo char_mux_type_info = { .parent = TYPE_CHARDEV, .class_init = char_mux_class_init, .instance_size = sizeof(MuxChardev), + .instance_finalize = char_mux_finalize, }; static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, -- 2.11.0