Restore terminal attributes for tty based monitor
PATCH 1/1 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
--- qemu-char.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
qemu-char.c +8 -0
@@ -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
Fix codding style
--- qemu-char.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
qemu-char.c +9 -0
@@ -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,9 @@ 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
Quoted 40 lines · Shahar Havivi
Fix codding style
--- qemu-char.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)qemu-char.c +9
-1@@ -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,9 @@ 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__ */ --
Quoted 2 lines
1.6.3.3
If qemu is invoked with both stdio and one or more host tty's only the last one referenced is reset one exit. Also, shouldn't the attributes be reset when the device is closed as opposed to exit? ie., a device connected to a tty chardev is removed via the monitor.
David
Quoted 60 lines · David S. Ahern
Date: Fri, 26 Feb 2010 15:19:19 -0700
From: "David S. Ahern" <[email protected]>
To: Shahar Havivi <[email protected]>
CC: [email protected], Dor Laor <[email protected]>
Subject: Re: [Qemu-devel] [PATCH] Restore terminal attributes for tty based
monitorQuoted 40 lines · Shahar Havivi
Fix codding style
--- qemu-char.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)qemu-char.c +9
-1@@ -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,9 @@ 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__ */ --Quoted 2 lines
1.6.3.3
If qemu is invoked with both stdio and one or more host tty's only the last one referenced is reset one exit. Also, shouldn't the attributes be reset when the device is closed as opposed to exit? ie., a device connected to a tty chardev is removed via the monitor.
Quoted 1 line
David
stdio have the same handling code:
http://git.savannah.gnu.org/cgit/qemu.git/tree/qemu-char.c#n738
Shahar
Quoted 61 lines · Shahar Havivi
Quoted 60 lines · David S. Ahern
Date: Fri, 26 Feb 2010 15:19:19 -0700
From: "David S. Ahern" <[email protected]>
To: Shahar Havivi <[email protected]>
CC: [email protected], Dor Laor <[email protected]>
Subject: Re: [Qemu-devel] [PATCH] Restore terminal attributes for tty based
monitorQuoted 40 lines · Shahar Havivi
Fix codding style
--- qemu-char.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)qemu-char.c +9
-1@@ -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,9 @@ 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__ */ --Quoted 2 lines
1.6.3.3
If qemu is invoked with both stdio and one or more host tty's only the last one referenced is reset one exit. Also, shouldn't the attributes be reset when the device is closed as opposed to exit? ie., a device connected to a tty chardev is removed via the monitor.
Quoted 5 lines
Quoted 1 line
David
stdio have the same handling code:
http://git.savannah.gnu.org/cgit/qemu.git/tree/qemu-char.c#n738Shahar
Right now stdio is the only user of the oldtty global, so it holds the atributes for stdio. If you reuse the variable you are setting the tty (ttyN or ttySN) to the attributes retrieved from stdin - assuming it was even used.
I think you want to save the attributes for the terminal that is in use and reset that terminal on close / exit.
David
Quoted 79 lines · David S. Ahern
Date: Sat, 27 Feb 2010 09:20:28 -0700
From: "David S. Ahern" <[email protected]>
To: Shahar Havivi <[email protected]>
CC: [email protected], Dor Laor <[email protected]>
Subject: Re: [Qemu-devel] [PATCH] Restore terminal attributes for tty based
monitorQuoted 61 lines · Shahar Havivi
Quoted 60 lines · David S. Ahern
Date: Fri, 26 Feb 2010 15:19:19 -0700
From: "David S. Ahern" <[email protected]>
To: Shahar Havivi <[email protected]>
CC: [email protected], Dor Laor <[email protected]>
Subject: Re: [Qemu-devel] [PATCH] Restore terminal attributes for tty based
monitorQuoted 40 lines · Shahar Havivi
Fix codding style
--- qemu-char.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)qemu-char.c +9
-1@@ -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,9 @@ 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__ */ --Quoted 2 lines
1.6.3.3
If qemu is invoked with both stdio and one or more host tty's only the last one referenced is reset one exit. Also, shouldn't the attributes be reset when the device is closed as opposed to exit? ie., a device connected to a tty chardev is removed via the monitor.
Quoted 5 lines
Quoted 1 line
David
stdio have the same handling code:
http://git.savannah.gnu.org/cgit/qemu.git/tree/qemu-char.c#n738Shahar
Quoted 7 lines
Right now stdio is the only user of the oldtty global, so it holds the atributes for stdio. If you reuse the variable you are setting the tty (ttyN or ttySN) to the attributes retrieved from stdin - assuming it was even used.
I think you want to save the attributes for the terminal that is in use and reset that terminal on close / exit.
The oldtty global can be reuse, as far for the ttnN and ttySN you right, it may be wrong for them, I will recheck.
Shahar.
Quoted 2 lines
David
Anthony Liguori
AppliedQuoted 8 lines · Shahar Havivi
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
Quoted 44 lines
--- qemu-char.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)qemu-char.c +8
-1@@ -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