[PATCH v2 4/8] util: remove use of is_daemonized flag from logging code

[Daniel P. Berrangé]

We want to decouple knowledge of daemonization from other code. What the
logging code really wants to know is whether it can use stdio or not.
Add an API to let the logging code be informed of this fact explicitly.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 include/qemu/log.h |  1 +
 softmmu/vl.c       |  3 +++
 util/log.c         | 12 +++++++++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/qemu/log.h b/include/qemu/log.h
index 9b80660207..a35e11a788 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -147,6 +147,7 @@ typedef struct QEMULogItem {
 
 extern const QEMULogItem qemu_log_items[];
 
+void qemu_log_stdio_disable(void);
 void qemu_set_log(int log_flags);
 void qemu_log_needs_buffers(void);
 void qemu_set_log_filename(const char *filename, Error **errp);
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 1fe028800f..f6f33e15e4 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3664,6 +3664,9 @@ void qemu_init(int argc, char **argv, char **envp)
                     error_report("Option not supported in this build");
                     exit(1);
                 }
+                if (is_daemonized()) {
+                    qemu_log_stdio_disable();
+                }
             }
         }
     }
diff --git a/util/log.c b/util/log.c
index 2ee1500bee..a123622ee3 100644
--- a/util/log.c
+++ b/util/log.c
@@ -33,6 +33,12 @@ QemuLogFile *qemu_logfile;
 int qemu_loglevel;
 static int log_append = 0;
 static GArray *debug_regions;
+static bool stdio_disabled;
+
+void qemu_log_stdio_disable(void)
+{
+    stdio_disabled = true;
+}
 
 /* Return the number of characters emitted.  */
 int qemu_log(const char *fmt, ...)
@@ -92,7 +98,7 @@ void qemu_set_log(int log_flags)
      *   If we are daemonized,
      *     we will only log if there is a logfilename.
      */
-    if (qemu_loglevel && (!is_daemonized() || logfilename)) {
+    if (qemu_loglevel && (!stdio_disabled || logfilename)) {
         need_to_open_file = true;
     }
     QEMU_LOCK_GUARD(&qemu_logfile_mutex);
@@ -110,7 +116,7 @@ void qemu_set_log(int log_flags)
                 _exit(1);
             }
             /* In case we are a daemon redirect stderr to logfile */
-            if (is_daemonized()) {
+            if (stdio_disabled) {
                 dup2(fileno(logfile->fd), STDERR_FILENO);
                 fclose(logfile->fd);
                 /* This will skip closing logfile in qemu_log_close() */
@@ -118,7 +124,7 @@ void qemu_set_log(int log_flags)
             }
         } else {
             /* Default to stderr if no log file specified */
-            assert(!is_daemonized());
+            assert(!stdio_disabled);
             logfile->fd = stderr;
         }
         /* must avoid mmap() usage of glibc by setting a buffer "by hand" */
-- 
2.34.1