From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 27 Apr 2016 10:58:13 +0000 (+0200)
Subject: qemu: conf: Set default logging approach in virQEMUDriverConfigNew
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=63e2b766a5a704eb19b8bdaeb1cf0fa91f990cb8;p=libvirt.git

qemu: conf: Set default logging approach in virQEMUDriverConfigNew

Instead of setting the default qemu stdio logging approach in
virQEMUDriverConfigLoadFile set it in virQEMUDriverConfigNew so that
it's properly set even when the config is not present.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325075
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 77ef4fe3ad..5ed5776a45 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -324,6 +324,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
     cfg->seccompSandbox = -1;
 
     cfg->logTimestamp = true;
+    cfg->stdioLogD = true;
 
 #ifdef DEFAULT_LOADER_NVRAM
     if (virQEMUDriverConfigLoaderNVRAMParse(cfg, DEFAULT_LOADER_NVRAM) < 0)
@@ -812,8 +813,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
             goto cleanup;
         }
         VIR_FREE(stdioHandler);
-    } else {
-        cfg->stdioLogD = true;
     }
 
     GET_VALUE_ULONG("max_queued", cfg->maxQueuedJobs);