mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/core: Move system emulation files to system_ss

Browse Source 
hotplug.c, qdev-hotplug.c and reset.c are not used by user emulation
and need not be included in hwcore_ss.  Move them to system_ss, where
they belong, by letting the linker pull in the stubs when needed.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240408155330.522792-8-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-04-08 17:53:19 +02:00
parent 3df4c28860
commit 971febb8f5
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/core/meson.build
View File

@ -3,7 +3,6 @@ hwcore_ss.add(files(
'bus.c', 'bus.c',
'qdev-properties.c', 'qdev-properties.c',
'qdev.c', 'qdev.c',
'reset.c',
'resetcontainer.c', 'resetcontainer.c',
'resettable.c', 'resettable.c',
'vmstate-if.c', 'vmstate-if.c',
@ -12,16 +11,6 @@ hwcore_ss.add(files(
'clock.c', 'clock.c',
'qdev-clock.c', 'qdev-clock.c',
)) ))
if have_system
hwcore_ss.add(files(
'hotplug.c',
'qdev-hotplug.c',
))
else
hwcore_ss.add(files(
'hotplug-stubs.c',
))
endif
common_ss.add(files('cpu-common.c')) common_ss.add(files('cpu-common.c'))
common_ss.add(files('machine-smp.c')) common_ss.add(files('machine-smp.c'))
@ -40,6 +29,7 @@ system_ss.add(files(
'cpu-sysemu.c', 'cpu-sysemu.c',
'fw-path-provider.c', 'fw-path-provider.c',
'gpio.c', 'gpio.c',
'hotplug.c',
'loader.c', 'loader.c',
'machine-hmp-cmds.c', 'machine-hmp-cmds.c',
'machine-qmp-cmds.c', 'machine-qmp-cmds.c',
@ -48,7 +38,9 @@ system_ss.add(files(
'null-machine.c', 'null-machine.c',
'numa.c', 'numa.c',
'qdev-fw.c', 'qdev-fw.c',
'qdev-hotplug.c',
'qdev-properties-system.c', 'qdev-properties-system.c',
'reset.c',
'sysbus.c', 'sysbus.c',
'vm-change-state-handler.c', 'vm-change-state-handler.c',
'clock-vmstate.c', 'clock-vmstate.c',

0
hw/core/hotplug-stubs.c → stubs/hotplug-stubs.c
View File

1
stubs/meson.build
View File

@ -14,6 +14,7 @@ stub_ss.add(files('fdset.c'))
stub_ss.add(files('gdbstub.c')) stub_ss.add(files('gdbstub.c'))
stub_ss.add(files('get-vm-name.c')) stub_ss.add(files('get-vm-name.c'))
stub_ss.add(files('graph-lock.c')) stub_ss.add(files('graph-lock.c'))
stub_ss.add(files('hotplug-stubs.c'))
if linux_io_uring.found() if linux_io_uring.found()
stub_ss.add(files('io_uring.c')) stub_ss.add(files('io_uring.c'))
endif endif