vl: make sure char-pty message displayed by moving setbuf to the beginning
PATCH 1/1 vl: make sure char-pty message displayed by moving setbuf to the beginning
Recently we found a behavior change after commit 6ade45f2ac93611 ('char-pty: Print "char device redirected" message to stdout').
When we redirect output to a file, the message "char device redirected to PTY_NAME (label LABEL)" would not be seen at the beginning of the file. Instead, the message is displayed after QEMU quit. This will block test automation.
The reason is this message is printed after we set line buffer mode. So move this to the beginning.
--- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
vl.c +2 -2
@@ -2890,6 +2890,8 @@ int main(int argc, char **argv, char **envp)char *dir, **dirs;BlockdevOptionsQueue bdo_queue =QSIMPLEQ_HEAD_INITIALIZER (bdo_queue); +os_set_line_buffering (); +error_init (argv[0 ]);module_call_init (MODULE_INIT_TRACE );
@@ -4246,8 +4248,6 @@ int main(int argc, char **argv, char **envp)semihosting_arg_fallback (kernel_filename, kernel_cmdline); } -os_set_line_buffering (); -/* spice needs the timers to be initialized by this point */ qemu_spice_init ();
Signature · 1 line
2.17.1
Paolo Bonzini
AppliedQuoted 31 lines · Wei Yang
Recently we found a behavior change after commit
6ade45f2ac93611('char-pty: Print "char device redirected" message to stdout').When we redirect output to a file, the message "char device redirected to
PTY_NAME(label LABEL)" would not be seen at the beginning of the file. Instead, the message is displayed after QEMU quit. This will block test automation.The reason is this message is printed after we set line buffer mode. So move this to the beginning.
Signed-off-by Wei Yang <[email protected]>--- vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)vl.c +2
-0@@ -2890,6 +2890,8 @@ int main(int argc, char **argv, char **envp)char *dir, **dirs;BlockdevOptionsQueue bdo_queue =QSIMPLEQ_HEAD_INITIALIZER (bdo_queue); +os_set_line_buffering (); +error_init (argv[0 ]);module_call_init (MODULE_INIT_TRACE );
vl.c int main(int argc, char **argv, char **envp) · line 4253
Quoted 8 lines
vl.c +0
-2@@ -4246,8 +4248,6 @@ int main(int argc, char **argv, char **envp)semihosting_arg_fallback (kernel_filename, kernel_cmdline); } -os_set_line_buffering (); -/* spice needs the timers to be initialized by this point */ qemu_spice_init ();
Queued, thanks.
Paolo