[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/40] char-fd: convert to finalize
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 14/40] char-fd: convert to finalize |
Date: |
Wed, 11 Jan 2017 18:29:30 +0100 |
char-serial inherits from char-fd finalizer.
Signed-off-by: Marc-André Lureau <address@hidden>
---
qemu-char.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 4cbcc29bd5..b106f6ef33 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1296,9 +1296,10 @@ static void fd_chr_update_read_handler(Chardev *chr,
}
}
-static void fd_chr_free(struct Chardev *chr)
+static void char_fd_finalize(Object *obj)
{
- FDChardev *s = FD_CHARDEV(chr);
+ Chardev *chr = CHARDEV(obj);
+ FDChardev *s = FD_CHARDEV(obj);
remove_fd_in_watch(chr);
if (s->ioc_in) {
@@ -1337,13 +1338,13 @@ static void char_fd_class_init(ObjectClass *oc, void
*data)
cc->chr_add_watch = fd_chr_add_watch;
cc->chr_write = fd_chr_write;
cc->chr_update_read_handler = fd_chr_update_read_handler;
- cc->chr_free = fd_chr_free;
}
static const TypeInfo char_fd_type_info = {
.name = TYPE_CHARDEV_FD,
.parent = TYPE_CHARDEV,
.instance_size = sizeof(FDChardev),
+ .instance_finalize = char_fd_finalize,
.class_init = char_fd_class_init,
.abstract = true,
};
@@ -1425,7 +1426,6 @@ static void qemu_chr_set_echo_stdio(Chardev *chr, bool
echo)
static void char_stdio_finalize(Object *obj)
{
term_exit();
- fd_chr_free(CHARDEV(chr));
}
static void qemu_chr_open_stdio(Chardev *chr,
@@ -1913,11 +1913,6 @@ static int tty_serial_ioctl(Chardev *chr, int cmd, void
*arg)
}
return 0;
}
-
-static void qemu_chr_free_tty(Chardev *chr)
-{
- fd_chr_free(chr);
-}
#endif /* __linux__ || __sun__ */
#if defined(__linux__)
@@ -4758,7 +4753,6 @@ static void char_serial_class_init(ObjectClass *oc, void
*data)
cc->open = qmp_chardev_open_serial;
#ifndef _WIN32
cc->chr_ioctl = tty_serial_ioctl;
- cc->chr_free = qemu_chr_free_tty;
#endif
}
--
2.11.0
- [Qemu-devel] [PATCH 04/40] mux: convert to finalize, (continued)
- [Qemu-devel] [PATCH 04/40] mux: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 05/40] char-udp: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 07/40] char-pty: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 06/40] char-socket: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 08/40] char-ringbuf: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 10/40] char-stdio: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 09/40] char-parallel: convert parallel to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 13/40] char-win: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 11/40] char-win-stdio: convert to finalize, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 14/40] char-fd: convert to finalize,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 12/40] char-win: do not override chr_free, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 15/40] char: remove chr_free, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 16/40] char: get rid of CharDriver, Marc-André Lureau, 2017/01/11
- [Qemu-devel] [PATCH 17/40] char: rename remaining CharDriver to Chardev, Marc-André Lureau, 2017/01/11