summaryrefslogtreecommitdiff
path: root/qemu-char.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-03-21 14:13:02 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-03-21 14:13:02 -0500
commitf7f9425cfed2dd5283baaab0914c7dff30a95345 (patch)
tree8edbda8b30cb4bbbd4636c1c9dbb8c6ecead181a /qemu-char.c
parentfad47514655603d4a156c9c4e8a1787dc1c3e086 (diff)
downloadqemu-f7f9425cfed2dd5283baaab0914c7dff30a95345.tar.gz
qemu-f7f9425cfed2dd5283baaab0914c7dff30a95345.tar.bz2
qemu-f7f9425cfed2dd5283baaab0914c7dff30a95345.zip
Revert "Convert atexit users to exit_notifier"
This reverts commit d7234f4d7e373a708e1df9ab565a71b71b189025. Conflicts: hw/xen_machine_pv.c This should have never been committed. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-char.c')
-rw-r--r--qemu-char.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/qemu-char.c b/qemu-char.c
index c02dfae43a..a3d6e64967 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -713,15 +713,9 @@ static void term_exit(void)
fcntl(0, F_SETFL, old_fd0_flags);
}
-static void term_exit_notifier(Notifier *notifier)
-{
- term_exit();
-}
-
static void term_init(QemuOpts *opts)
{
struct termios tty;
- static Notifier exit_notifier = { .notify = term_exit_notifier };
tcgetattr (0, &tty);
oldtty = tty;
@@ -741,9 +735,8 @@ static void term_init(QemuOpts *opts)
tcsetattr (0, TCSANOW, &tty);
- if (!term_atexit_done++) {
- exit_notifier_add(&exit_notifier);
- }
+ if (!term_atexit_done++)
+ atexit(term_exit);
fcntl(0, F_SETFL, O_NONBLOCK);
}