From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkwbG-0007Wu-89 for qemu-devel@nongnu.org; Fri, 26 Feb 2010 04:35:10 -0500 Received: from [199.232.76.173] (port=38521 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkwbF-0007Wm-GR for qemu-devel@nongnu.org; Fri, 26 Feb 2010 04:35:09 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkwbD-0006Ei-QC for qemu-devel@nongnu.org; Fri, 26 Feb 2010 04:35:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4066) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NkwbD-0006ER-Bq for qemu-devel@nongnu.org; Fri, 26 Feb 2010 04:35:07 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1Q9Z5m7006906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 26 Feb 2010 04:35:05 -0500 Date: Fri, 26 Feb 2010 11:34:59 +0200 From: Shahar Havivi Message-ID: <20100226093456.GA17347@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] Restore terminal attributes for tty based monitor List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Dor Laor 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(-) 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