mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-01 15:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

char-fd: convert to finalize

Browse Source 
char-serial inherits from char-fd finalizer.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-12-08 19:32:57 +03:00
parent 53a5736f94
commit 7f2fe073f3
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qemu-char.c
View File

@ -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); remove_fd_in_watch(chr);
if (s->ioc_in) { 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_add_watch = fd_chr_add_watch;
cc->chr_write = fd_chr_write; cc->chr_write = fd_chr_write;
cc->chr_update_read_handler = fd_chr_update_read_handler; cc->chr_update_read_handler = fd_chr_update_read_handler;
cc->chr_free = fd_chr_free;
} }
static const TypeInfo char_fd_type_info = { static const TypeInfo char_fd_type_info = {
.name = TYPE_CHARDEV_FD, .name = TYPE_CHARDEV_FD,
.parent = TYPE_CHARDEV, .parent = TYPE_CHARDEV,
.instance_size = sizeof(FDChardev), .instance_size = sizeof(FDChardev),
.instance_finalize = char_fd_finalize,
.class_init = char_fd_class_init, .class_init = char_fd_class_init,
.abstract = true, .abstract = true,
}; };
@ -1425,7 +1426,6 @@ static void qemu_chr_set_echo_stdio(Chardev *chr, bool echo)
static void char_stdio_finalize(Object *obj) static void char_stdio_finalize(Object *obj)
{ {
term_exit(); term_exit();
fd_chr_free(CHARDEV(chr));
} }
static void qemu_chr_open_stdio(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; return 0;
} }
static void qemu_chr_free_tty(Chardev *chr)
{
fd_chr_free(chr);
}
#endif /* __linux__ || __sun__ */ #endif /* __linux__ || __sun__ */
#if defined(__linux__) #if defined(__linux__)
@ -4760,7 +4755,6 @@ static void char_serial_class_init(ObjectClass *oc, void *data)
cc->open = qmp_chardev_open_serial; cc->open = qmp_chardev_open_serial;
#ifndef _WIN32 #ifndef _WIN32
cc->chr_ioctl = tty_serial_ioctl; cc->chr_ioctl = tty_serial_ioctl;
cc->chr_free = qemu_chr_free_tty;
#endif #endif
} }