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 /hw/core | |
| parent | 3df4c28860e100011db3a51a8a331506a3fe51f0 (diff) | |
| download | focaccia-qemu-971febb8f5e810c2d167ac9cb5bd1cdaf6ca688d.tar.gz focaccia-qemu-971febb8f5e810c2d167ac9cb5bd1cdaf6ca688d.zip | |
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>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/hotplug-stubs.c | 34 | ||||
| -rw-r--r-- | hw/core/meson.build | 14 |
2 files changed, 3 insertions, 45 deletions
diff --git a/hw/core/hotplug-stubs.c b/hw/core/hotplug-stubs.c deleted file mode 100644 index 7aadaa29bd..0000000000 --- a/hw/core/hotplug-stubs.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Hotplug handler stubs - * - * Copyright (c) Red Hat - * - * Authors: - * Philippe Mathieu-Daudé <philmd@redhat.com>, - * - * SPDX-License-Identifier: GPL-2.0-or-later - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ -#include "qemu/osdep.h" -#include "hw/qdev-core.h" - -HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) -{ - return NULL; -} - -void hotplug_handler_pre_plug(HotplugHandler *plug_handler, - DeviceState *plugged_dev, - Error **errp) -{ - g_assert_not_reached(); -} - -void hotplug_handler_plug(HotplugHandler *plug_handler, - DeviceState *plugged_dev, - Error **errp) -{ - g_assert_not_reached(); -} diff --git a/hw/core/meson.build b/hw/core/meson.build index e26f2e088c..f20d4143f7 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', |