Message ID | 1456833053-8896-1-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, 1 Mar 2016 12:50:53 +0100 Paolo Bonzini <pbonzini@redhat.com> wrote: > Commit 96c33a4 ("log: Redirect stderr to logfile if deamonized", > 2016-02-22) wanted to move stderr of a daemonized QEMU to the file > specified with -D. > > However, if -D was not passed, the patch had the side effect of not > redirecting stderr to /dev/null. This happened because qemu_logfile > was set to stderr rather than the expected value of NULL. The fix > is simply in the "if" condition of do_qemu_set_log; the "if" for > closing the file is also changed to match. > > Reported-by: Jan Tomko <jtomko@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > util/log.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) This fixes running qemu under libvirt for me. Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
On Di, 2016-03-01 at 12:50 +0100, Paolo Bonzini wrote: > Commit 96c33a4 ("log: Redirect stderr to logfile if deamonized", > 2016-02-22) wanted to move stderr of a daemonized QEMU to the file > specified with -D. > > However, if -D was not passed, the patch had the side effect of not > redirecting stderr to /dev/null. This happened because qemu_logfile > was set to stderr rather than the expected value of NULL. The fix > is simply in the "if" condition of do_qemu_set_log; the "if" for > closing the file is also changed to match. Tested-by: Gerd Hoffmann <kraxel@redhat.com> cheers, Gerd
diff --git a/util/log.c b/util/log.c index a7ddc7e..8b921de 100644 --- a/util/log.c +++ b/util/log.c @@ -56,7 +56,8 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers) #ifdef CONFIG_TRACE_LOG qemu_loglevel |= LOG_TRACE; #endif - if ((qemu_loglevel || is_daemonized()) && !qemu_logfile) { + if (!qemu_logfile && + (is_daemonized() ? logfilename != NULL : qemu_loglevel)) { if (logfilename) { qemu_logfile = fopen(logfilename, log_append ? "a" : "w"); if (!qemu_logfile) { @@ -72,6 +73,7 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers) } } else { /* Default to stderr if no log file specified */ + assert(!is_daemonized()); qemu_logfile = stderr; } /* must avoid mmap() usage of glibc by setting a buffer "by hand" */ @@ -89,7 +91,8 @@ void do_qemu_set_log(int log_flags, bool use_own_buffers) log_append = 1; } } - if (!qemu_loglevel && !is_daemonized() && qemu_logfile) { + if (qemu_logfile && + (is_daemonized() ? logfilename == NULL : !qemu_loglevel)) { qemu_log_close(); } }
Commit 96c33a4 ("log: Redirect stderr to logfile if deamonized", 2016-02-22) wanted to move stderr of a daemonized QEMU to the file specified with -D. However, if -D was not passed, the patch had the side effect of not redirecting stderr to /dev/null. This happened because qemu_logfile was set to stderr rather than the expected value of NULL. The fix is simply in the "if" condition of do_qemu_set_log; the "if" for closing the file is also changed to match. Reported-by: Jan Tomko <jtomko@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- util/log.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)