[067/143] meson: convert most of softmmu/

Commit Message

Paolo Bonzini Aug. 6, 2020, 7:15 p.m. UTC

Leave out main.c and vl.c, they're special due to fuzzing.

Signed-off-by: Paolo Bonzini <[e-mail]>
---
 meson.build           |  2 ++
 softmmu/Makefile.objs | 11 -----------
 softmmu/meson.build   |  9 +++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 softmmu/meson.build

Patch

diff --git a/meson.build b/meson.build
index 266ff64..bab875e 100644
--- a/meson.build
+++ b/meson.build
@@ -618,6 +618,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 a414a74..dd15c24 100644
--- a/softmmu/Makefile.objs
+++ b/softmmu/Makefile.objs
@@ -1,14 +1,3 @@ 
 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 := $(GPROF_CFLAGS) $(SDL_CFLAGS)
diff --git a/softmmu/meson.build b/softmmu/meson.build
new file mode 100644
index 0000000..d4ac51b
--- /dev/null
+++ b/softmmu/meson.build
@@ -0,0 +1,9 @@ 
+specific_ss.add(files(
+  'arch_init.c',
+  'balloon.c',
+  'cpus.c',
+  'cpu-throttle.c',
+  'ioport.c',
+  'memory.c',
+  'memory_mapping.c',
+  'qtest.c'))