[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/41] mux: convert to finalize
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 05/41] mux: convert to finalize |
Date: |
Mon, 30 Jan 2017 17:39:18 +0400 |
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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.295.gd7dffce1c.dirty
- [Qemu-devel] [PATCH v2 00/41] chardev: qom clean-up and split in various backend files, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 01/41] MAINTAINERS: add myself to qemu-char.c, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 02/41] spice-qemu-char: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 03/41] baum: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 04/41] msmouse: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 05/41] mux: convert to finalize,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 06/41] char-udp: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 07/41] char-socket: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 08/41] char-pty: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 09/41] char-ringbuf: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 10/41] char-parallel: convert parallel to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 11/41] char-stdio: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 12/41] char-win-stdio: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 13/41] char-win: do not override chr_free, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 14/41] char-win: convert to finalize, Marc-André Lureau, 2017/01/30
- [Qemu-devel] [PATCH v2 15/41] char-fd: convert to finalize, Marc-André Lureau, 2017/01/30