[PULL,20/20] tracing: install trace events file only if necessary

Commit Message

Stefan Hajnoczi April 20, 2023, 12:09 p.m. UTC

From: Carlos Santos <[e-mail]>

It is not useful when configuring with --enable-trace-backends=nop.

Signed-off-by: Carlos Santos <[e-mail]>
Signed-off-by: Stefan Hajnoczi <[e-mail]>
Message-Id: <[e-mail]>
---
 trace/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Carlos Santos Dec. 6, 2023, 10:26 a.m. UTC | #1

On Thu, Apr 20, 2023 at 9:10 AM Stefan Hajnoczi <[e-mail]> wrote:
>
> From: Carlos Santos <[e-mail]>
>
> It is not useful when configuring with --enable-trace-backends=nop.
>
> Signed-off-by: Carlos Santos <[e-mail]>
> Signed-off-by: Stefan Hajnoczi <[e-mail]>
> Message-Id: <[e-mail]>
> ---
>  trace/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/trace/meson.build b/trace/meson.build
> index 8e80be895c..30b1d942eb 100644
> --- a/trace/meson.build
> +++ b/trace/meson.build
> @@ -64,7 +64,7 @@ trace_events_all = custom_target('trace-events-all',
>                                   input: trace_events_files,
>                                   command: [ 'cat', '@INPUT@' ],
>                                   capture: true,
> -                                 install: true,
> +                                 install: get_option('trace_backends') != [ 'nop' ],
>                                   install_dir: qemu_datadir)
>
>  if 'ust' in get_option('trace_backends')
> --
> 2.39.2
>

Hello,

I still don't see this in the master branch. Is there something
preventing it from being applied?

Stefan Hajnoczi Dec. 7, 2023, 11:11 a.m. UTC | #2

On Wed, Dec 06, 2023 at 07:26:01AM -0300, Carlos Santos wrote:
> On Thu, Apr 20, 2023 at 9:10 AM Stefan Hajnoczi <[e-mail]> wrote:
> >
> > From: Carlos Santos <[e-mail]>
> >
> > It is not useful when configuring with --enable-trace-backends=nop.
> >
> > Signed-off-by: Carlos Santos <[e-mail]>
> > Signed-off-by: Stefan Hajnoczi <[e-mail]>
> > Message-Id: <[e-mail]>
> > ---
> >  trace/meson.build | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/trace/meson.build b/trace/meson.build
> > index 8e80be895c..30b1d942eb 100644
> > --- a/trace/meson.build
> > +++ b/trace/meson.build
> > @@ -64,7 +64,7 @@ trace_events_all = custom_target('trace-events-all',
> >                                   input: trace_events_files,
> >                                   command: [ 'cat', '@INPUT@' ],
> >                                   capture: true,
> > -                                 install: true,
> > +                                 install: get_option('trace_backends') != [ 'nop' ],
> >                                   install_dir: qemu_datadir)
> >
> >  if 'ust' in get_option('trace_backends')
> > --
> > 2.39.2
> >
> 
> Hello,
> 
> I still don't see this in the master branch. Is there something
> preventing it from being applied?

Hi Carlos,
Apologies, I dropped this patch when respinning the pull request after
the CI test failures caused by the zoned patches.

Your patch has been merged on my tracing tree again and will make it
into qemu.git/master when the development window opens again after the
QEMU 8.2.0 release (hopefully next Tuesday).

Stefan

> 
> -- 
> Carlos Santos
> Senior Software Maintenance Engineer
> Red Hat
> [e-mail]    T: [phone]
>

Carlos Santos Dec. 11, 2023, 9:49 p.m. UTC | #3

On Mon, Dec 11, 2023 at 4:58 PM Stefan Hajnoczi <[e-mail]> wrote:
>
> On Wed, Dec 06, 2023 at 07:26:01AM -0300, Carlos Santos wrote:
> > On Thu, Apr 20, 2023 at 9:10 AM Stefan Hajnoczi <[e-mail]> wrote:
> > >
> > > From: Carlos Santos <[e-mail]>
> > >
> > > It is not useful when configuring with --enable-trace-backends=nop.
> > >
> > > Signed-off-by: Carlos Santos <[e-mail]>
> > > Signed-off-by: Stefan Hajnoczi <[e-mail]>
> > > Message-Id: <[e-mail]>
> > > ---
> > >  trace/meson.build | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/trace/meson.build b/trace/meson.build
> > > index 8e80be895c..30b1d942eb 100644
> > > --- a/trace/meson.build
> > > +++ b/trace/meson.build
> > > @@ -64,7 +64,7 @@ trace_events_all = custom_target('trace-events-all',
> > >                                   input: trace_events_files,
> > >                                   command: [ 'cat', '@INPUT@' ],
> > >                                   capture: true,
> > > -                                 install: true,
> > > +                                 install: get_option('trace_backends') != [ 'nop' ],
> > >                                   install_dir: qemu_datadir)
> > >
> > >  if 'ust' in get_option('trace_backends')
> > > --
> > > 2.39.2
> > >
> >
> > Hello,
> >
> > I still don't see this in the master branch. Is there something
> > preventing it from being applied?
>
> Hi Carlos,
> Apologies, I dropped this patch when respinning the pull request after
> the CI test failures caused by the zoned patches.
>
> Your patch has been merged on my tracing tree again and will make it
> into qemu.git/master when the development window opens again after the
> QEMU 8.2.0 release (hopefully next Tuesday).
>
> Stefan

Great. Thanks!

Patch

diff --git a/trace/meson.build b/trace/meson.build
index 8e80be895c..30b1d942eb 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -64,7 +64,7 @@  trace_events_all = custom_target('trace-events-all',
                                  input: trace_events_files,
                                  command: [ 'cat', '@INPUT@' ],
                                  capture: true,
-                                 install: true,
+                                 install: get_option('trace_backends') != [ 'nop' ],
                                  install_dir: qemu_datadir)
 
 if 'ust' in get_option('trace_backends')