From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Markus Armbruster <armbru@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH v4 06/13] meson: add trace_events_config[]
Date: Tue, 1 Jun 2021 15:24:07 +0200 [thread overview]
Message-ID: <20210601132414.432430-7-kraxel@redhat.com> (raw)
In-Reply-To: <20210601132414.432430-1-kraxel@redhat.com>
It's an array of dicts, where each dict holds the configuration for one
trace-events file. For now just fill it from trace_events_subdirs.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
meson.build | 1 +
trace/meson.build | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index a45f1a844f13..84a9e17533cb 100644
--- a/meson.build
+++ b/meson.build
@@ -1774,6 +1774,7 @@ target_user_arch = {}
# TODO: add each directory to the subdirs from its own meson.build, once
# we have those
+trace_events_config = []
trace_events_subdirs = [
'crypto',
'qapi',
diff --git a/trace/meson.build b/trace/meson.build
index 08f83a15c316..bc946495a714 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -2,10 +2,22 @@
specific_ss.add(files('control-target.c'))
trace_events_files = []
-foreach dir : [ '.' ] + trace_events_subdirs
- trace_events_file = meson.source_root() / dir / 'trace-events'
+
+trace_events_config += {
+ 'file' : meson.source_root() / 'trace-events',
+ 'group' : 'root',
+}
+foreach dir : trace_events_subdirs
+ trace_events_config += {
+ 'file' : meson.source_root() / dir / 'trace-events',
+ 'group' : dir.underscorify(),
+ }
+endforeach
+
+foreach c : trace_events_config
+ trace_events_file = c.get('file')
trace_events_files += [ trace_events_file ]
- group_name = dir == '.' ? 'root' : dir.underscorify()
+ group_name = c.get('group')
group = '--group=' + group_name
fmt = '@0@-' + group_name + '.@1@'
--
2.31.1
next prev parent reply other threads:[~2021-06-01 13:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 13:24 [PATCH v4 00/13] [RfC] fix tracing for modules Gerd Hoffmann
2021-06-01 13:24 ` [PATCH v4 01/13] qemu-trace-stap: changing SYSTEMTAP_TAPSET considered harmful Gerd Hoffmann
2021-06-09 12:39 ` Stefan Hajnoczi
2021-06-09 15:21 ` Daniel P. Berrangé
2021-06-01 13:24 ` [PATCH v4 02/13] trace: iter init tweaks Gerd Hoffmann
2021-06-01 13:24 ` [PATCH v4 03/13] trace: add trace_event_iter_init_group Gerd Hoffmann
2021-06-01 13:24 ` [PATCH v4 04/13] trace/simple: pass iter to st_write_event_mapping Gerd Hoffmann
2021-06-01 13:24 ` [PATCH v4 05/13] trace/simple: add st_init_group Gerd Hoffmann
2021-06-01 13:24 ` Gerd Hoffmann [this message]
2021-06-01 13:24 ` [PATCH v4 07/13] meson: move up hw subdir (specifically before trace subdir) Gerd Hoffmann
2021-06-09 12:42 ` Stefan Hajnoczi
2021-06-01 13:24 ` [PATCH v4 08/13] meson: add module_trace & module_trace_src Gerd Hoffmann
2021-06-01 13:24 ` [PATCH v4 09/13] trace/stap: build stap files for modules Gerd Hoffmann
2021-06-09 12:48 ` Stefan Hajnoczi
2021-06-01 13:24 ` [PATCH v4 10/13] meson: move qxl trace events to separate file Gerd Hoffmann
2021-06-01 13:24 ` [PATCH v4 11/13] virtio-gpu: split trace points Gerd Hoffmann
2021-06-09 12:49 ` Stefan Hajnoczi
2021-06-01 13:24 ` [PATCH v4 12/13] meson: move virtio trace events to separate file Gerd Hoffmann
2021-06-09 15:11 ` Stefan Hajnoczi
2021-06-01 13:24 ` [PATCH v4 13/13] meson: move virtio-gl " Gerd Hoffmann
2021-06-09 15:12 ` Stefan Hajnoczi
2021-06-09 15:14 ` [PATCH v4 00/13] [RfC] fix tracing for modules Stefan Hajnoczi
2021-06-10 6:32 ` Gerd Hoffmann
2021-06-10 7:58 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210601132414.432430-7-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).