[1/1] vl: fix tracing initialization
diff mbox

Message ID 1455036545-14870-1-git-send-email-den@openvz.org
State New
Headers show

Commit Message

Denis V. Lunev Feb. 9, 2016, 4:49 p.m. UTC
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 <pbonzini@redhat.com>
    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=simple

Spotted by Alex Bennée.

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Alex Bennée <alex.bennee@linaro.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
---
 vl.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Alex Bennée Feb. 9, 2016, 10:20 p.m. UTC | #1
Denis V. Lunev <den@openvz.org> writes:

> 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 <pbonzini@redhat.com>
>     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=simple
>
> Spotted by Alex Bennée.
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Alex Bennée <alex.bennee@linaro.org>
> CC: Paolo Bonzini <pbonzini@redhat.com>
> CC: Stefan Hajnoczi <stefanha@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>

https://travis-ci.org/stsquad/qemu/builds/108114393

> ---
>  vl.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index c581e39..ffaf8b7 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -4098,6 +4098,9 @@ int main(int argc, char **argv, char **envp)
>          exit(0);
>      }
>
> +    if (!trace_init_backends()) {
> +        exit(1);
> +    }
>      trace_init_file(trace_file);
>
>      /* Open the logfile at this point and set the log mask if necessary.
> @@ -4118,10 +4121,6 @@ int main(int argc, char **argv, char **envp)
>          qemu_set_log(0);
>      }
>
> -    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)) {


--
Alex Bennée
Christian Borntraeger Feb. 10, 2016, 9:32 a.m. UTC | #2
On 02/09/2016 05:49 PM, Denis V. Lunev wrote:
> 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 <pbonzini@redhat.com>
>     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=simple
> 
> Spotted by Alex Bennée.
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Alex Bennée <alex.bennee@linaro.org>
> CC: Paolo Bonzini <pbonzini@redhat.com>
> CC: Stefan Hajnoczi <stefanha@redhat.com>

Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Stefan Hajnoczi Feb. 11, 2016, 3:45 p.m. UTC | #3
On Tue, Feb 09, 2016 at 07:49:05PM +0300, Denis V. Lunev wrote:
> 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 <pbonzini@redhat.com>
>     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=simple
> 
> Spotted by Alex Bennée.
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Alex Bennée <alex.bennee@linaro.org>
> CC: Paolo Bonzini <pbonzini@redhat.com>
> CC: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  vl.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)

Thanks, applied to my tracing tree:
https://github.com/stefanha/qemu/commits/tracing

Stefan
Christian Borntraeger March 1, 2016, noon UTC | #4
On 02/11/2016 04:45 PM, Stefan Hajnoczi wrote:
> On Tue, Feb 09, 2016 at 07:49:05PM +0300, Denis V. Lunev wrote:
>> 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 <pbonzini@redhat.com>
>>     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=simple
>>
>> Spotted by Alex Bennée.
>>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> CC: Alex Bennée <alex.bennee@linaro.org>
>> CC: Paolo Bonzini <pbonzini@redhat.com>
>> CC: Stefan Hajnoczi <stefanha@redhat.com>
>> ---
>>  vl.c | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> Thanks, applied to my tracing tree:
> https://github.com/stefanha/qemu/commits/tracing
> 
> Stefan

When is this scheduled for integration? Without that patch not
only make check is broken, libvirt will also hang if qemu was 
build with --enable-trace-backends=simple during capability
detection.

Christian
Stefan Hajnoczi March 1, 2016, 1:36 p.m. UTC | #5
On Tue, Mar 01, 2016 at 01:00:21PM +0100, Christian Borntraeger wrote:
> On 02/11/2016 04:45 PM, Stefan Hajnoczi wrote:
> > On Tue, Feb 09, 2016 at 07:49:05PM +0300, Denis V. Lunev wrote:
> >> 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 <pbonzini@redhat.com>
> >>     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=simple
> >>
> >> Spotted by Alex Bennée.
> >>
> >> Signed-off-by: Denis V. Lunev <den@openvz.org>
> >> CC: Alex Bennée <alex.bennee@linaro.org>
> >> CC: Paolo Bonzini <pbonzini@redhat.com>
> >> CC: Stefan Hajnoczi <stefanha@redhat.com>
> >> ---
> >>  vl.c | 7 +++----
> >>  1 file changed, 3 insertions(+), 4 deletions(-)
> > 
> > Thanks, applied to my tracing tree:
> > https://github.com/stefanha/qemu/commits/tracing
> > 
> > Stefan
> 
> When is this scheduled for integration? Without that patch not
> only make check is broken, libvirt will also hang if qemu was 
> build with --enable-trace-backends=simple during capability
> detection.

I am sending a tracing pull request with this patch today.

Stefan

Patch
diff mbox

diff --git a/vl.c b/vl.c
index c581e39..ffaf8b7 100644
--- a/vl.c
+++ b/vl.c
@@ -4098,6 +4098,9 @@  int main(int argc, char **argv, char **envp)
         exit(0);
     }
 
+    if (!trace_init_backends()) {
+        exit(1);
+    }
     trace_init_file(trace_file);
 
     /* Open the logfile at this point and set the log mask if necessary.
@@ -4118,10 +4121,6 @@  int main(int argc, char **argv, char **envp)
         qemu_set_log(0);
     }
 
-    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)) {