4f059b938c
- hw/loongarch/virt: Fix FDT memory node address width - hw/loongarch: Fix fdt memory node wrong 'reg' - load_elf: fix iterator's type for elf file processing - migration/colo: Fix bdrv_graph_rdlock_main_loop: Assertion `!qemu_in_… - target/i386: no single-step exception after MOV or POP SS - char-stdio: Restore blocking mode of stdout on exit - backends/cryptodev-builtin: Fix local_error leaks - target/loongarch: fix a wrong print in cpu dump - virtio-pci: fix use of a released vector - target/arm: Disable SVE extensions when SVE is disabled - hw/misc/bcm2835_property: Fix handling of FRAMEBUFFER_SET_PALETTE - target/i386: Introduce SapphireRapids-v3 to add missing features - virtio-net: Ensure queue index fits with RSS (CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - update io/trace-events. Parameters should remain consistent. - update docs/tools/virtfs-proxy-helper.rst. This place is spelled wrong. - kvm: Add support for CSV2 reboot - target/i386/kvm: Fix the resettable info when emulate Hygon CSV2 guest - target/i386: get/set/migrate GHCB state - target/i386: csv: Add support for migrate VMSA for CSV2 guest - migration/ram: Accelerate the loading of CSV guest's encrypted pages - migration/ram: Accelerate the transmission of CSV guest's encrypted pages - target/i386: csv: add support to load incoming encrypted pages queued in the CMD list - target/i386: csv: add support to queue the incoming page into a list - target/i386: csv: add support to encrypt the outgoing pages in the list queued before. - target/i386: csv: add support to queue the outgoing page into a list - target/i386: csv: Read cert chain from file when prepared for CSV live migration - target/i386: Introduce header file csv.h - migration/ram: Fix calculation of gfn correpond to a page in ramblock - target/i386: sev: Clear shared_regions_list when reboot CSV Guest - migration/ram: Force encrypted status for VGA vram - target/i386: sev: Return 0 if sev_send_get_packet_len() fails - kvm: Add support for userspace MSR filtering and handling of MSR_KVM_MIGRATION_CONTROL. - migration/ram: Force encrypted status for flash0 & flash1 devices. - migration/ram: add support to send encrypted pages - migration: add support to migrate shared regions list - kvm: Add support for SEV shared regions list and KVM_EXIT_HYPERCALL. - target/i386: sev: add support to load incoming encrypted page - target/i386: sev: add support to encrypt the outgoing page - target/i386: sev: do not create launch context for an incoming guest - target/i386: sev: provide callback to setup outgoing context - confidential guest support: introduce ConfidentialGuestMemoryEncryptionOps for encrypted VMs - migration.json: add AMD SEV specific migration parameters - doc: update AMD SEV to include Live migration flow - crypto/tlscredspsk: Free username on finalize - hw/nvme: fix leak of uninitialized memory in io_mgmt_recv - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - cvm : Implement command blacklist for cvm security enhancement - crypto: Introduce SM3 hash hmac pbkdf algorithm - virtio-net: Use virtual time for RSC timers - vvfat: Fix bug in writing to middle of file - hw/core/ptimer: fix timer zero period condition for freq > 1GHz - hw/misc: support vpsp Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
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
|
|
|