qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "john.liuli" <john.liuli@huawei.com>
To: aliguori@amazon.com
Cc: Li Liu <john.liuli@huawei.com>, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH] qemu-char: fix terminal crash when using "-monitor stdio -nographic"
Date: Wed, 27 Aug 2014 13:00:51 +0800	[thread overview]
Message-ID: <1409115651-3612-1-git-send-email-john.liuli@huawei.com> (raw)

From: Li Liu <john.liuli@huawei.com>

Eeay to reproduce, just try "qemu -monitor stdio -nographic"
and type "quit", then the terminal will be crashed.

There are two pathes try to call tcgetattr of stdio in vl.c:

1) Monitor_parse(optarg, "readline");
   .....
   qemu_opts_foreach(qemu_find_opts("chardev"),
                     chardev_init_func, NULL, 1) != 0)

2) if (default_serial)
   add_device_config(DEV_SERIAL, "stdio");
   ....
   if (foreach_device_config(DEV_SERIAL, serial_parse) < 0)

Both of them will trigger qemu_chr_open_stdio which will disable
ECHO attributes. First one has updated the attributes of stdio
by calling qemu_chr_fe_set_echo(chr, false). And the tty
attributes has been saved in oldtty. Then the second path will
redo such actions, and the oldtty is overlapped. So till "quit",
term_exit can't recove the correct attributes.

Signed-off-by: Li Liu <john.liuli@huawei.com>
---
 qemu-char.c |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/qemu-char.c b/qemu-char.c
index d4f327a..941eb3e 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1017,6 +1017,7 @@ static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts)
 /* init terminal so that we can grab keys */
 static struct termios oldtty;
 static int old_fd0_flags;
+static bool stdio_is_ready;
 static bool stdio_allow_signal;
 
 static void term_exit(void)
@@ -1060,10 +1061,15 @@ static CharDriverState *qemu_chr_open_stdio(ChardevStdio *opts)
         error_report("cannot use stdio with -daemonize");
         return NULL;
     }
-    old_fd0_flags = fcntl(0, F_GETFL);
-    tcgetattr (0, &oldtty);
-    qemu_set_nonblock(0);
-    atexit(term_exit);
+
+    if (!stdio_is_ready) {
+        stdio_is_ready = true;
+
+        old_fd0_flags = fcntl(0, F_GETFL);
+        tcgetattr(0, &oldtty);
+        qemu_set_nonblock(0);
+        atexit(term_exit);
+    }
 
     chr = qemu_chr_open_fd(0, 1);
     chr->chr_close = qemu_chr_close_stdio;
-- 
1.7.9.5

             reply	other threads:[~2014-08-27  5:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-27  5:00 john.liuli [this message]
2014-08-27  6:44 ` [Qemu-devel] [PATCH] qemu-char: fix terminal crash when using "-monitor stdio -nographic" Markus Armbruster
2014-08-27  7:40   ` Li Liu
2014-09-05  1:38     ` Li Liu
2014-09-05  9:04       ` Markus Armbruster
2014-09-05  9:31         ` Gerd Hoffmann
2014-09-09  2:22           ` Li Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1409115651-3612-1-git-send-email-john.liuli@huawei.com \
    --to=john.liuli@huawei.com \
    --cc=aliguori@amazon.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).