From: Daniel P. Berrangé Date: Mon, 4 Jun 2018 12:30:43 +0000 (+0100) Subject: chardev: don't splatter terminal settings on exit if not previously set X-Git-Tag: v3.0.0-rc0~48^2~57 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1507bd136fd9a516226fce8738d361a64f45b699;p=thirdparty%2Fqemu.git chardev: don't splatter terminal settings on exit if not previously set The stdio chardev finalize method calls term_exit() to restore the original terminal settings that were saved in the "oldtty" global. If the qemu_chr_open_stdio() method exited with an error, we might not have any original terminal settings saved in "oldtty" yet. eg $ qemu-system-x86_64 -monitor stdio -daemonize qemu-system-x86_64: -monitor stdio: cannot use stdio with -daemonize will cause QEMU to splatter the terminal settings with an all-zeros "struct termios", with predictably unpleasant results. Fortunately the existing "stdio_in_use" flag is suitable witness for whether "oldtty" contains settings that need restoring. Signed-off-by: Daniel P. Berrangé Message-Id: <20180604123043.13985-1-berrange@redhat.com> Reviewed-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 96375f2ab88..9624220e6d5 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -46,8 +46,10 @@ static bool stdio_echo_state; static void term_exit(void) { - tcsetattr(0, TCSANOW, &oldtty); - fcntl(0, F_SETFL, old_fd0_flags); + if (stdio_in_use) { + tcsetattr(0, TCSANOW, &oldtty); + fcntl(0, F_SETFL, old_fd0_flags); + } } static void qemu_chr_set_echo_stdio(Chardev *chr, bool echo)