On 02/20/2010 09:18 AM, David S. Ahern wrote:
On 02/20/2010 01:30 AM, Shahar Havivi wrote:
when exiting qemu that run with "-monitor /dev/tty", the launching
terminal get weird behaviour because no restore terminals action has
taken.
added chr_close and register atexit() code for tty devices (like stdio
does)
Signed-off-by: Shahar Havivi<shah...@redhat.com>
---
qemu-char.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 75dbf66..de16883 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,17 @@ 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(struct CharDriverState *chr)
+{
+ tty_exit();
+ fd_chr_close(chr);
+}
The close callback needs to close the fd for the device as well. I have
sent a patch to handle this; waiting for it to be included:
http://permalink.gmane.org/gmane.comp.emulators.qemu/63472
It didn't apply with git-am. I'm not sure why, am investigating now.
Regards,
Anthony Liguori
David
+
static CharDriverState *qemu_chr_open_tty(QemuOpts *opts)
{
const char *filename = qemu_opt_get(opts, "path");
@@ -1190,6 +1202,8 @@ static CharDriverState *qemu_chr_open_tty(QemuOpts *opts)
return NULL;
}
chr->chr_ioctl = tty_serial_ioctl;
+ chr->chr_close = qemu_chr_close_tty;
+ atexit(tty_exit);
return chr;
}
#else /* ! __linux__&& ! __sun__ */