From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH 4/4] [broken] meson: try link tracepoints to module
Date: Thu, 19 Nov 2020 09:44:48 +0100 [thread overview]
Message-ID: <20201119084448.24397-5-kraxel@redhat.com> (raw)
In-Reply-To: <20201119084448.24397-1-kraxel@redhat.com>
Add source set to trace_events_config, use it in trace/meson.build
so the trace objects are linked to the module not core qemu.
Not working as intended.
/me looks puzzled.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/meson.build | 1 +
trace/meson.build | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/display/meson.build b/hw/display/meson.build
index c2fc36e19d3e..94e355ac1e81 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -46,6 +46,7 @@ if config_all_devices.has_key('CONFIG_QXL')
trace_events_config += {
'file' : meson.source_root() / 'hw' / 'display' / 'trace-events-qxl',
'group' : 'hw_display_qxl',
+ 'ss' : qxl_ss,
}
hw_display_modules += {'qxl': qxl_ss}
endif
diff --git a/trace/meson.build b/trace/meson.build
index 66395d3e2ba7..3f0fe7b7b74c 100644
--- a/trace/meson.build
+++ b/trace/meson.build
@@ -18,6 +18,7 @@ foreach c : trace_events_config
trace_events_files += [ trace_events_file ]
group = '--group=' + c.get('group')
fmt = '@0@-' + c.get('group') + '.@1@'
+ module_ss = c.get('ss', trace_ss)
trace_h = custom_target(fmt.format('trace', 'h'),
output: fmt.format('trace', 'h'),
@@ -36,10 +37,10 @@ foreach c : trace_events_config
input: trace_events_file,
command: [ tracetool, group, '--format=ust-events-h', '@INPUT@' ],
capture: true)
- trace_ss.add(trace_ust_h, lttng, urcubp)
+ module_ss.add(trace_ust_h, lttng, urcubp)
genh += trace_ust_h
endif
- trace_ss.add(trace_h, trace_c)
+ module_ss.add(trace_h, trace_c)
if 'CONFIG_TRACE_DTRACE' in config_host
trace_dtrace = custom_target(fmt.format('trace-dtrace', 'dtrace'),
output: fmt.format('trace-dtrace', 'dtrace'),
@@ -50,13 +51,13 @@ foreach c : trace_events_config
output: fmt.format('trace-dtrace', 'h'),
input: trace_dtrace,
command: [ 'dtrace', '-o', '@OUTPUT@', '-h', '-s', '@INPUT@' ])
- trace_ss.add(trace_dtrace_h)
+ module_ss.add(trace_dtrace_h)
if host_machine.system() != 'darwin'
trace_dtrace_o = custom_target(fmt.format('trace-dtrace', 'o'),
output: fmt.format('trace-dtrace', 'o'),
input: trace_dtrace,
command: [ 'dtrace', '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ])
- trace_ss.add(trace_dtrace_o)
+ module_ss.add(trace_dtrace_o)
endif
genh += trace_dtrace_h
--
2.27.0
next prev parent reply other threads:[~2020-11-19 8:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 8:44 [PATCH 0/4] [RfC] try fix tracing for modules Gerd Hoffmann
2020-11-19 8:44 ` [PATCH 1/4] meson: add trace_events_config[] Gerd Hoffmann
2020-11-19 9:50 ` Stefan Hajnoczi
2020-11-19 8:44 ` [PATCH 2/4] meson: move up hw subdir (specifically before trace subdir) Gerd Hoffmann
2020-11-19 10:01 ` Stefan Hajnoczi
2020-11-19 8:44 ` [PATCH 3/4] meson: move qxl trace events to separate file Gerd Hoffmann
2020-11-19 9:33 ` Daniel P. Berrangé
2020-11-19 10:06 ` Stefan Hajnoczi
2020-11-19 10:25 ` Gerd Hoffmann
2020-11-19 8:44 ` Gerd Hoffmann [this message]
2020-11-19 11:03 ` [PATCH 4/4] [broken] meson: try link tracepoints to module Stefan Hajnoczi
2020-11-19 11:23 ` Gerd Hoffmann
2020-11-19 11:55 ` Stefan Hajnoczi
2020-11-20 10:23 ` Gerd Hoffmann
2020-11-20 11:25 ` Gerd Hoffmann
2020-11-20 12:30 ` Philippe Mathieu-Daudé
2020-11-20 13:06 ` Paolo Bonzini
2020-11-20 13:15 ` Gerd Hoffmann
2020-11-20 13:05 ` Paolo Bonzini
2020-11-23 11:38 ` Gerd Hoffmann
2020-11-23 13:16 ` Paolo Bonzini
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=20201119084448.24397-5-kraxel@redhat.com \
--to=kraxel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.