summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2016-01-07 16:55:25 +0300
committerStefan Hajnoczi <stefanha@redhat.com>2016-02-03 09:19:09 +0000
commitf246b86672118e4f0d0782f4c240d3666aa36710 (patch)
tree2ce83618d743baf3114e0a8423cb3897620b94e9
parent41fc57e44ed64cd4ab5393d83624afd897dabd4f (diff)
downloadfocaccia-qemu-f246b86672118e4f0d0782f4c240d3666aa36710.tar.gz
focaccia-qemu-f246b86672118e4f0d0782f4c240d3666aa36710.zip
trace: no need to call trace_backend_init in different branches now
original idea to split calling locations was to spawn tracing thread
in the final child process according to

    commit 8a745f2a9296ad2cf6bda33534ed298f2625a4ad
    Author: Michael Mueller
    Date:   Mon Sep 23 16:36:54 2013 +0200

os_daemonize is now on top of both locations. Drop unneeded ifs.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1452174932-28657-5-git-send-email-den@openvz.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rw-r--r--vl.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/vl.c b/vl.c
index 955f364550..6370efee5f 100644
--- a/vl.c
+++ b/vl.c
@@ -4110,10 +4110,8 @@ int main(int argc, char **argv, char **envp)
         qemu_set_log(mask);
     }
 
-    if (!is_daemonized()) {
-        if (!trace_init_backends()) {
-            exit(1);
-        }
+    if (!trace_init_backends()) {
+        exit(1);
     }
 
     /* If no data_dir is specified then try to find it relative to the
@@ -4657,12 +4655,6 @@ int main(int argc, char **argv, char **envp)
 
     os_setup_post();
 
-    if (is_daemonized()) {
-        if (!trace_init_backends()) {
-            exit(1);
-        }
-    }
-
     main_loop();
     replay_disable_events();