[v4] fix tracing for modules

[PATCH v4 07/13] meson: move up hw subdir (specifically before trace subdir)

Posted by Gerd Hoffmann 4 years, 8 months ago

Needed so trace/meson.build can see trace_events_config[]
changes done in hw/*/meson.build.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 84a9e17533cb..b1f2e7920977 100644
--- a/meson.build
+++ b/meson.build
@@ -1878,6 +1878,10 @@ if 'CONFIG_VHOST_USER' in config_host
   vhost_user = libvhost_user.get_variable('vhost_user_dep')
 endif
 
+# any subdir updating trace_events_config[] must
+# come before the 'trace' subdir.
+subdir('hw')
+
 subdir('qapi')
 subdir('qobject')
 subdir('stubs')
@@ -1988,7 +1992,6 @@ subdir('monitor')
 subdir('net')
 subdir('replay')
 subdir('semihosting')
-subdir('hw')
 subdir('accel')
 subdir('plugins')
 subdir('bsd-user')
-- 
2.31.1

Re: [PATCH v4 07/13] meson: move up hw subdir (specifically before trace subdir)

Posted by Stefan Hajnoczi 4 years, 8 months ago

On Tue, Jun 01, 2021 at 03:24:08PM +0200, Gerd Hoffmann wrote:
> Needed so trace/meson.build can see trace_events_config[]
> changes done in hw/*/meson.build.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  meson.build | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>