aboutsummaryrefslogtreecommitdiff
path: root/qemu-char.c
diff options
context:
space:
mode:
authorShahar Havivi <shaharh@redhat.com>2010-02-26 11:34:59 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2010-03-09 08:47:27 -0600
commit2d753894c7553d6a05e8fdbed5f4704398919a35 (patch)
treed48f0452c9e0bd5ccd240fbdb7379135c878cca5 /qemu-char.c
parent7ffb82ca6e13feeb37b86a8223da691eff5ee922 (diff)
downloadqemu-2d753894c7553d6a05e8fdbed5f4704398919a35.zip
qemu-2d753894c7553d6a05e8fdbed5f4704398919a35.tar.gz
qemu-2d753894c7553d6a05e8fdbed5f4704398919a35.tar.bz2
Restore terminal attributes for tty based monitor
Patch http://permalink.gmane.org/gmane.comp.emulators.qemu/63472 handle close when using tty devices (like /dev/ttyS0), yet tty based monitor are not restoring terminal attributes (as done with stdio based monitor), when closing qemu after that command: $ qemu -monitor /dev/tty the terminal is not responding until you write reset (blindly), this patch fix it Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-char.c')
-rw-r--r--qemu-char.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/qemu-char.c b/qemu-char.c
index 86c7c5a..0e25ef3 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1002,6 +1002,7 @@ static void tty_serial_init(int fd, int speed,
speed, parity, data_bits, stop_bits);
#endif
tcgetattr (fd, &tty);
+ oldtty = tty;
#define check_speed(val) if (speed <= val) { spd = B##val; break; }
speed = speed * 10 / 11;
@@ -1173,6 +1174,11 @@ static int tty_serial_ioctl(CharDriverState *chr, int cmd, void *arg)
return 0;
}
+static void tty_exit(void)
+{
+ tcsetattr(0, TCSANOW, &oldtty);
+}
+
static void qemu_chr_close_tty(CharDriverState *chr)
{
FDCharDriver *s = chr->opaque;
@@ -1207,6 +1213,8 @@ static CharDriverState *qemu_chr_open_tty(QemuOpts *opts)
}
chr->chr_ioctl = tty_serial_ioctl;
chr->chr_close = qemu_chr_close_tty;
+ if (!term_atexit_done++)
+ atexit(tty_exit);
return chr;
}
#else /* ! __linux__ && ! __sun__ */