diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-06 13:40:26 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 06:30:22 -0400 |
| commit | 5d3ea0e17db463362578f47a47b5f0c4348516a2 (patch) | |
| tree | 27dcedc4e3650dc2cc06c5008d27e53d740b314e | |
| parent | 4a96337dfa714f4d15cf9769b6a932a25be48421 (diff) | |
| download | focaccia-qemu-5d3ea0e17db463362578f47a47b5f0c4348516a2.tar.gz focaccia-qemu-5d3ea0e17db463362578f47a47b5f0c4348516a2.zip | |
meson: convert most of softmmu/
Leave out main.c, it's special due to fuzzing. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | softmmu/Makefile.objs | 14 | ||||
| -rw-r--r-- | softmmu/meson.build | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meson.build b/meson.build index ff200900ed..442855daef 100644 --- 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 c036887500..ec74d8a9fa 100644 --- 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 index 0000000000..95d38df259 --- /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')) |