meson: convert most of softmmu/

Leave out main.c, it's special due to fuzzing.

Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/meson.build b/meson.build
index ff200900ed976918ec67f0ec4586f94594c36054..442855daeff467e2d815e79f92f3d3108415b61c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -645,6 +645,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt],  if_true: [files('device_tree.c')])
 
 common_ss.add(files('cpus-common.c'))
 
+subdir('softmmu')
+
 # needed for fuzzing binaries
 subdir('tests/qtest/libqos')
 

diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs
index c0368875005c1d5fc8f363751314a777b4d8b24b..ec74d8a9fa8c80cade21bc9f733662d48a163fc0 100644 (file)
--- a/softmmu/Makefile.objs
+++ b/softmmu/Makefile.objs
@@ -1,14 +1,2 @@
 softmmu-main-y = softmmu/main.o
-
-obj-y += arch_init.o
-obj-y += cpus.o
-obj-y += cpu-throttle.o
-obj-y += balloon.o
-obj-y += ioport.o
-obj-y += memory.o
-obj-y += memory_mapping.o
-
-obj-y += qtest.o
-
-obj-y += vl.o
-vl.o-cflags := $(SDL_CFLAGS)
+main.o-cflags := $(SDL_CFLAGS)

diff --git a/softmmu/meson.build b/softmmu/meson.build
new file mode 100644 (file)
index 0000000..95d38df
--- /dev/null
+++ b/softmmu/meson.build
@@ -0,0 +1,10 @@
+specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
+  'arch_init.c',
+  'balloon.c',
+  'cpus.c',
+  'cpu-throttle.c',
+  'ioport.c',
+  'memory.c',
+  'memory_mapping.c',
+  'qtest.c',
+  'vl.c'))