On 1/22/21 9:44 PM, Philippe Mathieu-Daudé wrote: > The trace_events_subdirs array is split in two different > locations, merge it as one. > > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > Cc: Stefan Hajnoczi <stefa...@redhat.com> > --- > meson.build | 28 +++++++++++++--------------- > 1 file changed, 13 insertions(+), 15 deletions(-) > > diff --git a/meson.build b/meson.build > index 181f8795f5a..c43538a1523 100644 > --- a/meson.build > +++ b/meson.build > @@ -1686,7 +1686,20 @@ > 'accel/kvm', > 'accel/tcg', > 'crypto', > + 'hw/core', > + 'qapi', > + 'qom', > 'monitor', > + 'target/arm', > + 'target/hppa', > + 'target/i386', > + 'target/i386/kvm', > + 'target/mips', > + 'target/ppc', > + 'target/riscv', > + 'target/s390x', > + 'target/sparc', > + 'util', > ] > if have_user > trace_events_subdirs += [ 'linux-user' ] > @@ -1759,21 +1772,6 @@ > 'ui', > ] > endif > -trace_events_subdirs += [ > - 'hw/core', > - 'qapi', > - 'qom', > - 'target/arm', > - 'target/hppa', > - 'target/i386', > - 'target/i386/kvm', > - 'target/mips', > - 'target/ppc', > - 'target/riscv', > - 'target/s390x', > - 'target/sparc', > - 'util', > -] > > vhost_user = not_found > if 'CONFIG_VHOST_USER' in config_host >
Reviewed-by: Claudio Fontana <cfont...@suse.de>
