From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55738 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVkVQ-0006Ej-0X for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVkVO-0000mp-Of for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:51 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:49297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVkVO-0000j4-8z for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:50 -0500 Received: by mail-wy0-f173.google.com with SMTP id 36so6559023wyg.4 for ; Thu, 23 Dec 2010 04:42:49 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 23 Dec 2010 13:42:50 +0100 Message-Id: <1293108174-24895-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1293108174-24895-1-git-send-email-pbonzini@redhat.com> References: <1293108174-24895-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/8] add set_echo implementation for qemu_chr_stdio List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This also requires moving QemuOpts out of term_init. Clearing ISIG is independent of whether echo is enabled or disabled. Signed-off-by: Paolo Bonzini --- qemu-char.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index cc20fa0..7b61a62 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -715,6 +715,7 @@ static void stdio_read(void *opaque) /* init terminal so that we can grab keys */ static struct termios oldtty; static int old_fd0_flags; +static bool stdio_allow_signal; static void term_exit(void) { @@ -722,22 +723,24 @@ static void term_exit(void) fcntl(0, F_SETFL, old_fd0_flags); } -static void term_init(QemuOpts *opts) +static void qemu_chr_set_echo_stdio(CharDriverState *chr, bool echo) { struct termios tty; tty = oldtty; - tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP + if (!echo) { + tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP |INLCR|IGNCR|ICRNL|IXON); - tty.c_oflag |= OPOST; - tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN); + tty.c_oflag |= OPOST; + tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN); + tty.c_cflag &= ~(CSIZE|PARENB); + tty.c_cflag |= CS8; + tty.c_cc[VMIN] = 1; + tty.c_cc[VTIME] = 0; + } /* if graphical mode, we allow Ctrl-C handling */ - if (!qemu_opt_get_bool(opts, "signal", display_type != DT_NOGRAPHIC)) + if (!stdio_allow_signal) tty.c_lflag &= ~ISIG; - tty.c_cflag &= ~(CSIZE|PARENB); - tty.c_cflag |= CS8; - tty.c_cc[VMIN] = 1; - tty.c_cc[VTIME] = 0; tcsetattr (0, TCSANOW, &tty); } @@ -765,9 +768,12 @@ static CharDriverState *qemu_chr_open_stdio(QemuOpts *opts) chr = qemu_chr_open_fd(0, 1); chr->chr_close = qemu_chr_close_stdio; + chr->chr_set_echo = qemu_chr_set_echo_stdio; qemu_set_fd_handler2(0, stdio_read_poll, stdio_read, NULL, chr); stdio_nb_clients++; - term_init(opts); + stdio_allow_signal = qemu_opt_get_bool(opts, "signal", + display_type != DT_NOGRAPHIC); + qemu_chr_set_echo(chr, false); return chr; } -- 1.7.3.2