Skip to contentSkip to conversation

meson: build chardev trace files when have_block

PATCH In review Daniel P. Berrangé 2 participants 2 messages Jul 23, 2024 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson: build chardev trace files when have_block

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.

---
 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

meson.build +1 -1
index a1e51277b0..d3850a8c0f 100644
@@ -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',
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Daniel P. Berrangé

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.

Quoted 34 lines
---
 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

meson.build +1 -2
index a1e51277b0..d3850a8c0f 100644
@@ -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