| Message ID | 20100226093456.GA17347@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 02/26/2010 03:34 AM, Shahar Havivi wrote: > 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 > Applied. Thanks. Regards, Anthony Liguori > --- > qemu-char.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/qemu-char.c b/qemu-char.c > index 4169492..7aae21b 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__ */ > -- > 1.6.3.3 > > > > >
diff --git a/qemu-char.c b/qemu-char.c index 4169492..7aae21b 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__ */