Merge tag 'pull-tcg-20231004' of https://gitlab.com/rth7680/qemu into staging

[mirror_qemu.git] / softmmu / meson.build

diff --git a/softmmu/meson.build b/softmmu/meson.build
index 1a7c7ac089b0c5386a4f22c4b5d025d6bd96091b..3a64dd89de1f1c79201df75ccbc633c519ca9b4c 100644 (file)
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -1,28 +1,24 @@
-specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
+specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files(
   'arch_init.c',
   'ioport.c',
   'memory.c',
   'physmem.c',
-  'qtest.c',
-  'dirtylimit.c',
   'watchpoint.c',
 )])
 
-specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files(
-  'icount.c',
-)])
-
-softmmu_ss.add(files(
+system_ss.add(files(
   'balloon.c',
   'bootdevice.c',
   'cpus.c',
   'cpu-throttle.c',
   'cpu-timers.c',
   'datadir.c',
+  'dirtylimit.c',
   'dma-helpers.c',
   'globals.c',
   'memory_mapping.c',
   'qdev-monitor.c',
+  'qtest.c',
   'rtc.c',
   'runstate-action.c',
   'runstate-hmp-cmds.c',
@@ -32,8 +28,9 @@ softmmu_ss.add(files(
 ), sdl, libpmem, libdaxctl)
 
 if have_tpm
-  softmmu_ss.add(files('tpm.c'))
+  system_ss.add(files('tpm.c'))
 endif
 
-softmmu_ss.add(when: seccomp, if_true: files('qemu-seccomp.c'))
-softmmu_ss.add(when: fdt, if_true: files('device_tree.c'))
+system_ss.add(when: seccomp, if_true: files('qemu-seccomp.c'))
+system_ss.add(when: fdt, if_true: files('device_tree.c'))
+system_ss.add(when: 'CONFIG_LINUX', if_true: files('async-teardown.c'))