softmmu: move more files to softmmu/

Keep most softmmu_ss files into the system-emulation-specific
directory.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-06 09:01:22 +02:00
parent 8d0bceba24
commit 800d4deda0
9 changed files with 15 additions and 14 deletions

View File

@ -2235,7 +2235,7 @@ Device Tree
M: Alistair Francis <alistair.francis@wdc.com> M: Alistair Francis <alistair.francis@wdc.com>
R: David Gibson <david@gibson.dropbear.id.au> R: David Gibson <david@gibson.dropbear.id.au>
S: Maintained S: Maintained
F: device_tree.c F: softmmu/device_tree.c
F: include/sysemu/device_tree.h F: include/sysemu/device_tree.h
Dump Dump
@ -2281,6 +2281,7 @@ F: include/exec/memop.h
F: include/exec/memory.h F: include/exec/memory.h
F: include/exec/ram_addr.h F: include/exec/ram_addr.h
F: include/exec/ramblock.h F: include/exec/ramblock.h
F: softmmu/dma-helpers.c
F: softmmu/ioport.c F: softmmu/ioport.c
F: softmmu/memory.c F: softmmu/memory.c
F: include/exec/memory-internal.h F: include/exec/memory-internal.h
@ -2461,7 +2462,7 @@ F: include/monitor/qdev.h
F: include/qom/ F: include/qom/
F: qapi/qom.json F: qapi/qom.json
F: qapi/qdev.json F: qapi/qdev.json
F: qdev-monitor.c F: softmmu/qdev-monitor.c
F: qom/ F: qom/
F: tests/check-qom-interface.c F: tests/check-qom-interface.c
F: tests/check-qom-proplist.c F: tests/check-qom-proplist.c
@ -2591,7 +2592,7 @@ F: docs/interop/dbus-vmstate.rst
Seccomp Seccomp
M: Eduardo Otubo <otubo@redhat.com> M: Eduardo Otubo <otubo@redhat.com>
S: Supported S: Supported
F: qemu-seccomp.c F: softmmu/qemu-seccomp.c
F: include/sysemu/seccomp.h F: include/sysemu/seccomp.h
Cryptography Cryptography
@ -2957,7 +2958,7 @@ T: git https://github.com/stefanha/qemu.git block
Bootdevice Bootdevice
M: Gonglei <arei.gonglei@huawei.com> M: Gonglei <arei.gonglei@huawei.com>
S: Maintained S: Maintained
F: bootdevice.c F: softmmu/bootdevice.c
Quorum Quorum
M: Alberto Garcia <berto@igalia.com> M: Alberto Garcia <berto@igalia.com>

View File

@ -1365,17 +1365,7 @@ blockdev_ss.add(files(
# os-win32.c does not # os-win32.c does not
blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c')) blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')]) softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
softmmu_ss.add_all(blockdev_ss) softmmu_ss.add_all(blockdev_ss)
softmmu_ss.add(files(
'bootdevice.c',
'dma-helpers.c',
'qdev-monitor.c',
), sdl)
softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
softmmu_ss.add(when: 'CONFIG_SECCOMP', if_true: [files('qemu-seccomp.c'), seccomp])
softmmu_ss.add(when: fdt, if_true: files('device_tree.c'))
common_ss.add(files('cpus-common.c')) common_ss.add(files('cpus-common.c'))

View File

@ -14,3 +14,13 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files( specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files(
'icount.c' 'icount.c'
)]) )])
softmmu_ss.add(files(
'bootdevice.c',
'dma-helpers.c',
'qdev-monitor.c',
), sdl)
softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
softmmu_ss.add(when: 'CONFIG_SECCOMP', if_true: [files('qemu-seccomp.c'), seccomp])
softmmu_ss.add(when: fdt, if_true: files('device_tree.c'))