From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQzf0-00010g-4f for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:48:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQzez-0002WD-8K for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:48:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQzez-0002W2-3o for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:48:01 -0500 From: Stefan Hajnoczi Date: Wed, 3 Feb 2016 15:47:38 +0000 Message-Id: <1454514465-11856-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1454514465-11856-1-git-send-email-stefanha@redhat.com> References: <1454514465-11856-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 06/13] trace: no need to call trace_backend_init in different branches now List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Paolo Bonzini , Stefan Hajnoczi , "Denis V. Lunev" From: "Denis V. Lunev" 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 Reviewed-by: Paolo Bonzini Signed-off-by: Paolo Bonzini Message-id: 1452174932-28657-5-git-send-email-den@openvz.org Signed-off-by: Stefan Hajnoczi --- vl.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/vl.c b/vl.c index 955f364..6370efe 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(); -- 2.5.0