From patchwork Wed Feb 3 15:47:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 8204131 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DDD57BEEE5 for ; Wed, 3 Feb 2016 15:48:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 49AE720253 for ; Wed, 3 Feb 2016 15:48:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9CAB420251 for ; Wed, 3 Feb 2016 15:48:24 +0000 (UTC) Received: from localhost ([::1]:35725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQzfL-00019o-W9 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Feb 2016 10:48:24 -0500 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 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id B1037C0B2E2E; Wed, 3 Feb 2016 15:48:00 +0000 (UTC) Received: from localhost (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u13Flx8p027293; Wed, 3 Feb 2016 10:48:00 -0500 From: Stefan Hajnoczi To: 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Paolo Bonzini , Stefan Hajnoczi , "Denis V. Lunev" Subject: [Qemu-devel] [PULL 06/13] trace: no need to call trace_backend_init in different branches now X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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();