SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/qdev: Pass bus argument to qdev_hotplug_allowed()

Browse Source 
In preparation of checking the parent bus is hot(un)pluggable
in a few commits, pass a 'bus' argument to qdev_hotplug_allowed().

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
[PMD: Split from bigger patch, part 1/6]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20250110091908.64454-2-philmd@linaro.org>
This commit is contained in:
Akihiko Odaki 2024-02-18 15:57:11 +09:00 committed by Philippe Mathieu-Daudé
parent 8d2701072e
commit 8915c11859
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/core/qdev-hotplug.c
View File

@ -30,7 +30,7 @@ HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev)
return NULL; return NULL;
} }
bool qdev_hotplug_allowed(DeviceState *dev, Error **errp) bool qdev_hotplug_allowed(DeviceState *dev, BusState *bus, Error **errp)
{ {
MachineState *machine; MachineState *machine;
MachineClass *mc; MachineClass *mc;

2
include/hw/qdev-core.h
View File

@ -540,7 +540,7 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
int required_for_version); int required_for_version);
HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev); HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev);
HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev); HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev);
bool qdev_hotplug_allowed(DeviceState *dev, Error **errp); bool qdev_hotplug_allowed(DeviceState *dev, BusState *bus, Error **errp);
/** /**
* qdev_get_hotplug_handler() - Get handler responsible for device wiring * qdev_get_hotplug_handler() - Get handler responsible for device wiring

2
system/qdev-monitor.c
View File

@ -691,7 +691,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts,
/* Check whether the hotplug is allowed by the machine */ /* Check whether the hotplug is allowed by the machine */
if (phase_check(PHASE_MACHINE_READY)) { if (phase_check(PHASE_MACHINE_READY)) {
if (!qdev_hotplug_allowed(dev, errp)) { if (!qdev_hotplug_allowed(dev, bus, errp)) {
goto err_del_dev; goto err_del_dev;
} }