55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
|
From 5661b12a28b650226cca100aeddd92d5cc788153 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gao Jiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 12 Sep 2024 20:41:18 +0800
|
||
|
|
Subject: [PATCH] char-stdio: Restore blocking mode of stdout on exit
|
||
|
|
|
||
|
|
cherry picked from commit a0124e333e2176640f233e5ea57a2f413985d9b5
|
||
|
|
|
||
|
|
qemu_chr_open_fd() sets stdout into non-blocking mode. Restore the old
|
||
|
|
fd flags on exit to avoid breaking unsuspecting applications that run on
|
||
|
|
the same terminal after qemu and don't expect to get EAGAIN.
|
||
|
|
|
||
|
|
While at at, also ensure term_exit is called once (at the moment it's
|
||
|
|
called both from char_stdio_finalize() and as the atexit() hook.
|
||
|
|
|
||
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2423
|
||
|
|
Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
|
||
|
|
Link: https://lore.kernel.org/r/20240703190812.3459514-1-m
|
||
|
|
Signed-off-by: Gao Jiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
chardev/char-stdio.c | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
|
||
|
|
index 3c648678ab..b960ddd4e4 100644
|
||
|
|
--- a/chardev/char-stdio.c
|
||
|
|
+++ b/chardev/char-stdio.c
|
||
|
|
@@ -41,6 +41,7 @@
|
||
|
|
/* init terminal so that we can grab keys */
|
||
|
|
static struct termios oldtty;
|
||
|
|
static int old_fd0_flags;
|
||
|
|
+static int old_fd1_flags;
|
||
|
|
static bool stdio_in_use;
|
||
|
|
static bool stdio_allow_signal;
|
||
|
|
static bool stdio_echo_state;
|
||
|
|
@@ -50,6 +51,8 @@ static void term_exit(void)
|
||
|
|
if (stdio_in_use) {
|
||
|
|
tcsetattr(0, TCSANOW, &oldtty);
|
||
|
|
fcntl(0, F_SETFL, old_fd0_flags);
|
||
|
|
+ fcntl(1, F_SETFL, old_fd1_flags);
|
||
|
|
+ stdio_in_use = false;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -102,6 +105,7 @@ static void qemu_chr_open_stdio(Chardev *chr,
|
||
|
|
|
||
|
|
stdio_in_use = true;
|
||
|
|
old_fd0_flags = fcntl(0, F_GETFL);
|
||
|
|
+ old_fd1_flags = fcntl(1, F_GETFL);
|
||
|
|
tcgetattr(0, &oldtty);
|
||
|
|
if (!g_unix_set_fd_nonblocking(0, true, NULL)) {
|
||
|
|
error_setg_errno(errp, errno, "Failed to set FD nonblocking");
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|