From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55716 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVkVO-0006E9-Q6 for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVkVM-0000lx-Ry for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:50 -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 1PVkVM-0000j4-Ng for qemu-devel@nongnu.org; Thu, 23 Dec 2010 07:42:48 -0500 Received: by mail-wy0-f173.google.com with SMTP id 36so6559023wyg.4 for ; Thu, 23 Dec 2010 04:42:48 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 23 Dec 2010 13:42:49 +0100 Message-Id: <1293108174-24895-4-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 3/8] move atexit(term_exit) and O_NONBLOCK to qemu_chr_open_stdio List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org In the next patch, term_init will be changed to enable or disable echo at will. Move extraneous stuff out of it. Signed-off-by: Paolo Bonzini --- qemu-char.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index e2a5e91..cc20fa0 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -715,7 +715,6 @@ static void stdio_read(void *opaque) /* init terminal so that we can grab keys */ static struct termios oldtty; static int old_fd0_flags; -static int term_atexit_done; static void term_exit(void) { @@ -727,10 +726,7 @@ static void term_init(QemuOpts *opts) { struct termios tty; - tcgetattr (0, &tty); - oldtty = tty; - old_fd0_flags = fcntl(0, F_GETFL); - + tty = oldtty; tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP |INLCR|IGNCR|ICRNL|IXON); tty.c_oflag |= OPOST; @@ -744,11 +740,6 @@ static void term_init(QemuOpts *opts) tty.c_cc[VTIME] = 0; tcsetattr (0, TCSANOW, &tty); - - if (!term_atexit_done++) - atexit(term_exit); - - fcntl(0, F_SETFL, O_NONBLOCK); } static void qemu_chr_close_stdio(struct CharDriverState *chr) @@ -765,6 +756,13 @@ static CharDriverState *qemu_chr_open_stdio(QemuOpts *opts) if (stdio_nb_clients >= STDIO_MAX_CLIENTS) return NULL; + if (stdio_nb_clients == 0) { + old_fd0_flags = fcntl(0, F_GETFL); + tcgetattr (0, &oldtty); + fcntl(0, F_SETFL, O_NONBLOCK); + atexit(term_exit); + } + chr = qemu_chr_open_fd(0, 1); chr->chr_close = qemu_chr_close_stdio; qemu_set_fd_handler2(0, stdio_read_poll, stdio_read, NULL, chr); -- 1.7.3.2