meson: remove lib{system, user}_ss aliases

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20250521223414.248276-7-pierrick.bouvier@linaro.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Pierrick Bouvier 2025-05-21 15:34:13 -07:00 committed by Paolo Bonzini
parent 7ca433244c
commit d33717d7fc
7 changed files with 13 additions and 15 deletions

View file

@ -18,15 +18,15 @@ if get_option('plugins')
tcg_ss.add(files('plugin-gen.c')) tcg_ss.add(files('plugin-gen.c'))
endif endif
libuser_ss.add_all(tcg_ss) user_ss.add_all(tcg_ss)
libsystem_ss.add_all(tcg_ss) system_ss.add_all(tcg_ss)
libuser_ss.add(files( user_ss.add(files(
'user-exec.c', 'user-exec.c',
'user-exec-stub.c', 'user-exec-stub.c',
)) ))
libsystem_ss.add(files( system_ss.add(files(
'cputlb.c', 'cputlb.c',
'icount-common.c', 'icount-common.c',
'monitor.c', 'monitor.c',

View file

@ -5,13 +5,13 @@
# #
# We build two versions of gdbstub, one for each mode # We build two versions of gdbstub, one for each mode
libuser_ss.add(files( user_ss.add(files(
'gdbstub.c', 'gdbstub.c',
'syscalls.c', 'syscalls.c',
'user.c' 'user.c'
)) ))
libsystem_ss.add(files( system_ss.add(files(
'gdbstub.c', 'gdbstub.c',
'syscalls.c', 'syscalls.c',
'system.c' 'system.c'

View file

@ -26,7 +26,7 @@ system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c')) system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
system_ss.add(when: 'CONFIG_EIF', if_true: [files('eif.c'), zlib, libcbor, gnutls]) system_ss.add(when: 'CONFIG_EIF', if_true: [files('eif.c'), zlib, libcbor, gnutls])
libsystem_ss.add(files( system_ss.add(files(
'cpu-system.c', 'cpu-system.c',
'fw-path-provider.c', 'fw-path-provider.c',
'gpio.c', 'gpio.c',
@ -46,7 +46,7 @@ libsystem_ss.add(files(
'vm-change-state-handler.c', 'vm-change-state-handler.c',
'clock-vmstate.c', 'clock-vmstate.c',
)) ))
libuser_ss.add(files( user_ss.add(files(
'cpu-user.c', 'cpu-user.c',
'qdev-user.c', 'qdev-user.c',
)) ))

View file

@ -3694,14 +3694,12 @@ io_ss = ss.source_set()
qmp_ss = ss.source_set() qmp_ss = ss.source_set()
qom_ss = ss.source_set() qom_ss = ss.source_set()
system_ss = ss.source_set() system_ss = ss.source_set()
libsystem_ss = system_ss
specific_fuzz_ss = ss.source_set() specific_fuzz_ss = ss.source_set()
specific_ss = ss.source_set() specific_ss = ss.source_set()
rust_devices_ss = ss.source_set() rust_devices_ss = ss.source_set()
stub_ss = ss.source_set() stub_ss = ss.source_set()
trace_ss = ss.source_set() trace_ss = ss.source_set()
user_ss = ss.source_set() user_ss = ss.source_set()
libuser_ss = user_ss
util_ss = ss.source_set() util_ss = ss.source_set()
# accel modules # accel modules

View file

@ -61,8 +61,8 @@ endif
user_ss.add(files('user.c', 'api-user.c')) user_ss.add(files('user.c', 'api-user.c'))
system_ss.add(files('system.c', 'api-system.c')) system_ss.add(files('system.c', 'api-system.c'))
libuser_ss.add(files('api.c', 'core.c')) user_ss.add(files('api.c', 'core.c'))
libsystem_ss.add(files('api.c', 'core.c')) system_ss.add(files('api.c', 'core.c'))
common_ss.add(files('loader.c')) common_ss.add(files('loader.c'))

View file

@ -7,7 +7,7 @@ system_ss.add(files(
'vl.c', 'vl.c',
), sdl, libpmem, libdaxctl) ), sdl, libpmem, libdaxctl)
libsystem_ss.add(files( system_ss.add(files(
'balloon.c', 'balloon.c',
'bootdevice.c', 'bootdevice.c',
'cpus.c', 'cpus.c',

View file

@ -27,5 +27,5 @@ if host_os == 'linux'
tcg_ss.add(files('perf.c')) tcg_ss.add(files('perf.c'))
endif endif
libuser_ss.add_all(tcg_ss) user_ss.add_all(tcg_ss)
libsystem_ss.add_all(tcg_ss) system_ss.add_all(tcg_ss)