The SystemTap tapset generation code used a stale variable name
'exe_name'. This caused the following meson error:

  Unknown variable "exe_name"

The variable should be exe['name']. This fixes ./configure
--enable-trace-backend=dtrace with SystemTap.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index f0fe5f8799..f2aa5a7700 100644
--- a/meson.build
+++ b/meson.build
@@ -1029,14 +1029,14 @@ foreach target : target_dirs
 
     if 'CONFIG_TRACE_SYSTEMTAP' in config_host
       foreach stp: [
-        {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_dir() / exe_name, 'install': false},
-        {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') / get_option('bindir') / exe_name, 'install': true},
+        {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_dir() / exe['name'], 'install': false},
+        {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') / get_option('bindir') / exe['name'], 'install': true},
         {'ext': '-simpletrace.stp', 'fmt': 'simpletrace-stap', 'bin': '', 'install': true},
         {'ext': '-log.stp', 'fmt': 'log-stap', 'bin': '', 'install': true},
       ]
-        custom_target(exe_name + stp['ext'],
+        custom_target(exe['name'] + stp['ext'],
                       input: trace_events_all,
-                      output: exe_name + stp['ext'],
+                      output: exe['name'] + stp['ext'],
                       capture: true,
                       install: stp['install'],
                       install_dir: config_host['qemu_datadir'] / '../systemtap/tapset',
-- 
2.26.2

I have sent the same patch. I CCed Peter but forgot you, sorry.

Paolo

Il gio 27 ago 2020, 16:23 Stefan Hajnoczi <stefanha@redhat.com> ha scritto:

> The SystemTap tapset generation code used a stale variable name
> 'exe_name'. This caused the following meson error:
>
>   Unknown variable "exe_name"
>
> The variable should be exe['name']. This fixes ./configure
> --enable-trace-backend=dtrace with SystemTap.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  meson.build | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index f0fe5f8799..f2aa5a7700 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1029,14 +1029,14 @@ foreach target : target_dirs
>
>      if 'CONFIG_TRACE_SYSTEMTAP' in config_host
>        foreach stp: [
> -        {'ext': '.stp-build', 'fmt': 'stap', 'bin':
> meson.current_build_dir() / exe_name, 'install': false},
> -        {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') /
> get_option('bindir') / exe_name, 'install': true},
> +        {'ext': '.stp-build', 'fmt': 'stap', 'bin':
> meson.current_build_dir() / exe['name'], 'install': false},
> +        {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') /
> get_option('bindir') / exe['name'], 'install': true},
>          {'ext': '-simpletrace.stp', 'fmt': 'simpletrace-stap', 'bin': '',
> 'install': true},
>          {'ext': '-log.stp', 'fmt': 'log-stap', 'bin': '', 'install':
> true},
>        ]
> -        custom_target(exe_name + stp['ext'],
> +        custom_target(exe['name'] + stp['ext'],
>                        input: trace_events_all,
> -                      output: exe_name + stp['ext'],
> +                      output: exe['name'] + stp['ext'],
>                        capture: true,
>                        install: stp['install'],
>                        install_dir: config_host['qemu_datadir'] /
> '../systemtap/tapset',
> --
> 2.26.2
>
>