From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8qt0-0004xV-Rs for qemu-devel@nongnu.org; Wed, 07 Jan 2015 08:42:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y8qsu-0006cb-18 for qemu-devel@nongnu.org; Wed, 07 Jan 2015 08:42:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8qst-0006bY-Pq for qemu-devel@nongnu.org; Wed, 07 Jan 2015 08:42:51 -0500 From: Gal Hammer Date: Wed, 7 Jan 2015 10:38:35 +0200 Message-Id: <1420619915-8600-1-git-send-email-ghammer@redhat.com> Subject: [Qemu-devel] [PATCH V2] char: restore stdio echo on resume from suspend. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gal Hammer , peter.maydell@linaro.org, marcel.apfelbaum@gmail.com, pbonzini@redhat.com The monitor's auto-completion feature stopped working when stdio is used as an input and qemu was resumed after it was suspended (using ctrl-z). Signed-off-by: Gal Hammer --- V2 - restore old echo state rather than alway disable it. - don't check signal identifier in the handler function. - use sigaction() and not signal(). --- qemu-char.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index ef84b53..5430b87 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1112,6 +1112,9 @@ static struct termios oldtty; static int old_fd0_flags; static bool stdio_in_use; static bool stdio_allow_signal; +static bool stdio_echo_state; + +static void qemu_chr_set_echo_stdio(CharDriverState *chr, bool echo); static void term_exit(void) { @@ -1119,10 +1122,17 @@ static void term_exit(void) fcntl(0, F_SETFL, old_fd0_flags); } +static void term_stdio_handler(int sig) +{ + /* restore echo after resume from suspend. */ + qemu_chr_set_echo_stdio(NULL, stdio_echo_state); +} + static void qemu_chr_set_echo_stdio(CharDriverState *chr, bool echo) { struct termios tty; + stdio_echo_state = echo; tty = oldtty; if (!echo) { tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP @@ -1149,6 +1159,7 @@ static void qemu_chr_close_stdio(struct CharDriverState *chr) static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts) { CharDriverState *chr; + struct sigaction act; if (is_daemonized()) { error_report("cannot use stdio with -daemonize"); @@ -1166,6 +1177,10 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts) qemu_set_nonblock(0); atexit(term_exit); + memset(&act, 0, sizeof(act)); + act.sa_handler = term_stdio_handler; + sigaction(SIGCONT, &act, NULL); + chr = qemu_chr_open_fd(0, 1); chr->chr_close = qemu_chr_close_stdio; chr->chr_set_echo = qemu_chr_set_echo_stdio; -- 2.1.0