From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aamXJ-0006ts-BF for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aamXE-00036x-GQ for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aamXE-00036t-BQ for qemu-devel@nongnu.org; Tue, 01 Mar 2016 10:48:28 -0500 From: Stefan Hajnoczi Date: Tue, 1 Mar 2016 15:48:06 +0000 Message-Id: <1456847294-13576-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1456847294-13576-1-git-send-email-stefanha@redhat.com> References: <1456847294-13576-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 05/13] vl: fix tracing initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Stefan Hajnoczi , "Denis V. Lunev" From: "Denis V. Lunev" we should call trace_init_backends() before trace_init_file() for CONFIG_TRACE_SIMPLE There is no difference for other cases. This problem was introduced by the commit commit 41fc57e44ed64cd4ab5393d83624afd897dabd4f Author: Paolo Bonzini Date: Thu Jan 7 16:55:24 2016 +0300 trace: split trace_init_file out of trace_init_backends 'make check' was failed as a result if configured with --enable-trace-backends=3Dsimple Spotted by Alex Benn=C3=A9e. Signed-off-by: Denis V. Lunev Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Tested-by: Christian Borntraeger Message-id: 1455036545-14870-1-git-send-email-den@openvz.org CC: Alex Benn=C3=A9e CC: Paolo Bonzini CC: Stefan Hajnoczi Signed-off-by: Stefan Hajnoczi --- vl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index b87e292..adeddd9 100644 --- a/vl.c +++ b/vl.c @@ -4081,6 +4081,9 @@ int main(int argc, char **argv, char **envp) exit(0); } =20 + if (!trace_init_backends()) { + exit(1); + } trace_init_file(trace_file); =20 /* Open the logfile at this point and set the log mask if necessary. @@ -4101,10 +4104,6 @@ int main(int argc, char **argv, char **envp) qemu_set_log(0); } =20 - if (!trace_init_backends()) { - exit(1); - } - /* If no data_dir is specified then try to find it relative to the executable path. */ if (data_dir_idx < ARRAY_SIZE(data_dir)) { --=20 2.5.0