diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-08 17:53:19 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-18 11:17:27 +0200 |
| commit | 971febb8f5e810c2d167ac9cb5bd1cdaf6ca688d (patch) | |
| tree | 6bb4db43f297d7c391d227e57181f5ef98bf8cc0 | |
| parent | 3df4c28860e100011db3a51a8a331506a3fe51f0 (diff) | |
| download | qemu-971febb8f5e810c2d167ac9cb5bd1cdaf6ca688d.zip qemu-971febb8f5e810c2d167ac9cb5bd1cdaf6ca688d.tar.gz qemu-971febb8f5e810c2d167ac9cb5bd1cdaf6ca688d.tar.bz2 | |
hw/core: Move system emulation files to system_ss
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>
| -rw-r--r-- | hw/core/meson.build | 14 | ||||
| -rw-r--r-- | stubs/hotplug-stubs.c (renamed from hw/core/hotplug-stubs.c) | 0 | ||||
| -rw-r--r-- | stubs/meson.build | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/hw/core/meson.build b/hw/core/meson.build index e26f2e0..f20d414 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -3,7 +3,6 @@ hwcore_ss.add(files( 'bus.c', 'qdev-properties.c', 'qdev.c', - 'reset.c', 'resetcontainer.c', 'resettable.c', 'vmstate-if.c', @@ -12,16 +11,6 @@ hwcore_ss.add(files( '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('machine-smp.c')) @@ -40,6 +29,7 @@ system_ss.add(files( 'cpu-sysemu.c', 'fw-path-provider.c', 'gpio.c', + 'hotplug.c', 'loader.c', 'machine-hmp-cmds.c', 'machine-qmp-cmds.c', @@ -48,7 +38,9 @@ system_ss.add(files( 'null-machine.c', 'numa.c', 'qdev-fw.c', + 'qdev-hotplug.c', 'qdev-properties-system.c', + 'reset.c', 'sysbus.c', 'vm-change-state-handler.c', 'clock-vmstate.c', diff --git a/hw/core/hotplug-stubs.c b/stubs/hotplug-stubs.c index 7aadaa2..7aadaa2 100644 --- a/hw/core/hotplug-stubs.c +++ b/stubs/hotplug-stubs.c diff --git a/stubs/meson.build b/stubs/meson.build index 0bf25e6..f87f5c1 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -14,6 +14,7 @@ stub_ss.add(files('fdset.c')) stub_ss.add(files('gdbstub.c')) stub_ss.add(files('get-vm-name.c')) stub_ss.add(files('graph-lock.c')) +stub_ss.add(files('hotplug-stubs.c')) if linux_io_uring.found() stub_ss.add(files('io_uring.c')) endif |