diff mbox series

meson: build chardev trace files when have_block

Message ID 20240723103542.2998235-1-berrange@redhat.com
State New
Headers show
Series meson: build chardev trace files when have_block | expand

Commit Message

Daniel P. Berrangé July 23, 2024, 10:35 a.m. UTC 
The QSD depends on chardev code, and is built when have_tools is
true. This means conditionalizing chardev trace on have_system
is wrong, we need have_block which is set have_system || have_tools.

This latent bug was historically harmless because only the spice
chardev included tracing, which wasn't built in a !have_system
scenario.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This is an add-on needed for:

  https://lists.nongnu.org/archive/html/qemu-devel/2024-07/msg05068.html

since I discovered a tools-only build fails

Comments

Marc-André Lureau July 23, 2024, 12:39 p.m. UTC | #1 
On Tue, Jul 23, 2024 at 2:35 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> The QSD depends on chardev code, and is built when have_tools is
> true. This means conditionalizing chardev trace on have_system
> is wrong, we need have_block which is set have_system || have_tools.
>
> This latent bug was historically harmless because only the spice
> chardev included tracing, which wasn't built in a !have_system
> scenario.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> This is an add-on needed for:
>
>   https://lists.nongnu.org/archive/html/qemu-devel/2024-07/msg05068.html
>
> since I discovered a tools-only build fails
>
> diff --git a/meson.build b/meson.build
> index a1e51277b0..d3850a8c0f 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3327,6 +3327,7 @@ if have_block
>    trace_events_subdirs += [
>      'authz',
>      'block',
> +    'chardev',
>      'io',
>      'nbd',
>      'scsi',
> @@ -3338,7 +3339,6 @@ if have_system
>      'audio',
>      'backends',
>      'backends/tpm',
> -    'chardev',
>      'ebpf',
>      'hw/9pfs',
>      'hw/acpi',
> --
> 2.45.2
>
>
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index a1e51277b0..d3850a8c0f 100644
--- a/meson.build
+++ b/meson.build
@@ -3327,6 +3327,7 @@  if have_block
   trace_events_subdirs += [
     'authz',
     'block',
+    'chardev',
     'io',
     'nbd',
     'scsi',
@@ -3338,7 +3339,6 @@  if have_system
     'audio',
     'backends',
     'backends/tpm',
-    'chardev',
     'ebpf',
     'hw/9pfs',
     'hw/acpi',