]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: conf: Set default logging approach in virQEMUDriverConfigNew
authorPeter Krempa <pkrempa@redhat.com>
Wed, 27 Apr 2016 10:58:13 +0000 (12:58 +0200)
committerCole Robinson <crobinso@redhat.com>
Wed, 4 May 2016 23:10:42 +0000 (19:10 -0400)
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
(cherry picked from commit 63e2b766a5a704eb19b8bdaeb1cf0fa91f990cb8)

src/qemu/qemu_conf.c

index 77ef4fe3ad229cec50a98a8b58afe345c176a398..5ed5776a457488d6d1c4f5f96e8b80517ce235f5 100644 (file)
@@ -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);