Skip to contentSkip to conversation

accel: Build stubs once

PATCH Superseded Philippe Mathieu-Daudé 2 participants 3 messages Feb 25 – Feb 26 Arm/Amlogic Meson SoC support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 accel: Build stubs once

Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary.

---
 meson.build             |  2 +-
 accel/stubs/meson.build | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)
meson.build +1 -1
index db051a1b87b..5fecd6103a6 100644
@@ -3731,6 +3731,7 @@ subdir('io')
 subdir('chardev')
 subdir('fsdev')
 subdir('dump')
+subdir('accel')
 
 if have_system
   subdir('hw')
@@ -3849,7 +3850,6 @@ subdir('replay')
 subdir('stats')
 subdir('tcg')
 subdir('fpu')
-subdir('accel')
 subdir('plugins')
 subdir('ebpf')
 
accel/stubs/meson.build +9 -10
index 48eccd1b861..fd5b8b0da5a 100644
@@ -1,10 +1,9 @@
-system_stubs_ss = ss.source_set()
-system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
-system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
-system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
-system_stubs_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c'))
-system_stubs_ss.add(when: 'CONFIG_NVMM', if_false: files('nvmm-stub.c'))
-system_stubs_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c'))
-system_stubs_ss.add(when: 'CONFIG_MSHV', if_false: files('mshv-stub.c'))
-
-specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss)
+stub_ss.add(files(
+  'hvf-stub.c',
+  'kvm-stub.c',
+  'mshv-stub.c',
+  'nvmm-stub.c',
+  'tcg-stub.c',
+  'whpx-stub.c',
+  'xen-stub.c',
+))
Signature · 1 line
2.52.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Philippe Mathieu-Daudé

Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary.

---
  meson.build             |  2 +-
  accel/stubs/meson.build | 19 +++++++++----------
  2 files changed, 10 insertions(+), 11 deletions(-)

r~

#2 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 10 lines · Philippe Mathieu-Daudé

Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary.

---
  meson.build             |  2 +-
  accel/stubs/meson.build | 19 +++++++++----------
  2 files changed, 10 insertions(+), 11 deletions(-)

Patch queued, thanks.