[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/41] char-stdio: convert to finalize
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 11/41] char-stdio: convert to finalize |
Date: |
Tue, 31 Jan 2017 20:20:52 +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 1981058f45..390e6a99de 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1422,10 +1422,10 @@ static void qemu_chr_set_echo_stdio(Chardev *chr, bool
echo)
tcsetattr (0, TCSANOW, &tty);
}
-static void qemu_chr_free_stdio(struct Chardev *chr)
+static void char_stdio_finalize(Object *obj)
{
term_exit();
- fd_chr_free(chr);
+ fd_chr_free(CHARDEV(chr));
}
static void qemu_chr_open_stdio(Chardev *chr,
@@ -3859,7 +3859,6 @@ static void char_stdio_class_init(ObjectClass *oc, void
*data)
cc->chr_free = win_stdio_free;
#else
cc->chr_set_echo = qemu_chr_set_echo_stdio;
- cc->chr_free = qemu_chr_free_stdio;
#endif
}
@@ -3869,6 +3868,7 @@ static const TypeInfo char_stdio_type_info = {
.parent = TYPE_CHARDEV_WIN_STDIO,
#else
.parent = TYPE_CHARDEV_FD,
+ .instance_finalize = char_stdio_finalize,
#endif
.class_init = char_stdio_class_init,
};
--
2.11.0.295.gd7dffce1c.dirty
- [Qemu-devel] [PULL 01/41] MAINTAINERS: add myself to qemu-char.c, (continued)
- [Qemu-devel] [PULL 01/41] MAINTAINERS: add myself to qemu-char.c, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 02/41] spice-qemu-char: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 03/41] baum: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 04/41] msmouse: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 05/41] mux: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 06/41] char-udp: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 07/41] char-socket: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 08/41] char-pty: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 09/41] char-ringbuf: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 10/41] char-parallel: convert parallel to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 11/41] char-stdio: convert to finalize,
Marc-André Lureau <=
- [Qemu-devel] [PULL 12/41] char-win-stdio: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 13/41] char-win: do not override chr_free, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 14/41] char-win: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 15/41] char-fd: convert to finalize, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 16/41] char: remove chr_free, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 18/41] char: rename remaining CharDriver to Chardev, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 17/41] char: get rid of CharDriver, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 19/41] char: remove class kind field, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 20/41] char: move to chardev/, Marc-André Lureau, 2017/01/31
- [Qemu-devel] [PULL 22/41] char: make null_chr_write() the default method, Marc-André Lureau, 2017/01/31