aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2023-06-13 15:33:47 +0200
committerRichard Henderson <richard.henderson@linaro.org>2023-06-20 10:01:30 +0200
commitde6cd7599b518f0c832cc85980196ec02c129a86 (patch)
tree0b7d445fa70756ff121dd7cd23bfbae24ea0a98b /net
parentc7b64948f8ae4142b65f644164d0678892fe223d (diff)
meson: Replace softmmu_ss -> system_ss
We use the user_ss[] array to hold the user emulation sources, and the softmmu_ss[] array to hold the system emulation ones. Hold the latter in the 'system_ss[]' array for parity with user emulation. Mechanical change doing: $ sed -i -e s/softmmu_ss/system_ss/g $(git grep -l softmmu_ss) Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20230613133347.82210-10-philmd@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'net')
-rw-r--r--net/can/meson.build2
-rw-r--r--net/meson.build38
2 files changed, 20 insertions, 20 deletions
diff --git a/net/can/meson.build b/net/can/meson.build
index f53d9ec54f..45693c82c9 100644
--- a/net/can/meson.build
+++ b/net/can/meson.build
@@ -2,4 +2,4 @@ can_ss = ss.source_set()
can_ss.add(files('can_core.c', 'can_host.c'))
can_ss.add(when: 'CONFIG_LINUX', if_true: files('can_socketcan.c'))
-softmmu_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss)
+system_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss)
diff --git a/net/meson.build b/net/meson.build
index 6f4ecde57f..bdf564a57b 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -1,4 +1,4 @@
-softmmu_ss.add(files(
+system_ss.add(files(
'announce.c',
'checksum.c',
'dump.c',
@@ -18,41 +18,41 @@ softmmu_ss.add(files(
if get_option('replication').allowed() or \
get_option('colo_proxy').allowed()
- softmmu_ss.add(files('colo-compare.c'))
- softmmu_ss.add(files('colo.c'))
+ system_ss.add(files('colo-compare.c'))
+ system_ss.add(files('colo.c'))
endif
if get_option('colo_proxy').allowed()
- softmmu_ss.add(files('filter-rewriter.c'))
+ system_ss.add(files('filter-rewriter.c'))
endif
-softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
+system_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c'))
if have_l2tpv3
- softmmu_ss.add(files('l2tpv3.c'))
+ system_ss.add(files('l2tpv3.c'))
endif
-softmmu_ss.add(when: slirp, if_true: files('slirp.c'))
-softmmu_ss.add(when: vde, if_true: files('vde.c'))
+system_ss.add(when: slirp, if_true: files('slirp.c'))
+system_ss.add(when: vde, if_true: files('vde.c'))
if have_netmap
- softmmu_ss.add(files('netmap.c'))
+ system_ss.add(files('netmap.c'))
endif
if have_vhost_net_user
- softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c'))
- softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c'))
+ system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c'))
+ system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c'))
endif
-softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c'))
-softmmu_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c'))
-softmmu_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c'))
+system_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c'))
+system_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c'))
+system_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c'))
tap_posix = ['tap.c']
if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CONFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS')
tap_posix += 'tap-stub.c'
endif
-softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
-softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
+system_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
+system_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
if have_vhost_net_vdpa
- softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'), if_false: files('vhost-vdpa-stub.c'))
- softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c'))
+ system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'), if_false: files('vhost-vdpa-stub.c'))
+ system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c'))
endif
vmnet_files = files(
@@ -61,5 +61,5 @@ vmnet_files = files(
'vmnet-host.c',
'vmnet-shared.c'
)
-softmmu_ss.add(when: vmnet, if_true: vmnet_files)
+system_ss.add(when: vmnet, if_true: vmnet_files)
subdir('can')