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

hw/qdev: Factor qdev_hotunplug_allowed() out

Browse Source 
Factor qdev_hotunplug_allowed() out of qdev_unplug().
Start checking the device is not blocked.

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

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

@ -47,6 +47,11 @@ bool qdev_hotplug_allowed(DeviceState *dev, BusState *bus, Error **errp)
return true; return true;
} }
bool qdev_hotunplug_allowed(DeviceState *dev, Error **errp)
{
return !qdev_unplug_blocked(dev, errp);
}
HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev) HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev)
{ {
if (dev->parent_bus) { if (dev->parent_bus) {

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

@ -541,6 +541,7 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
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, BusState *bus, Error **errp); bool qdev_hotplug_allowed(DeviceState *dev, BusState *bus, Error **errp);
bool qdev_hotunplug_allowed(DeviceState *dev, 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

@ -909,7 +909,7 @@ void qdev_unplug(DeviceState *dev, Error **errp)
HotplugHandlerClass *hdc; HotplugHandlerClass *hdc;
Error *local_err = NULL; Error *local_err = NULL;
if (qdev_unplug_blocked(dev, errp)) { if (!qdev_hotunplug_allowed(dev, errp)) {
return; return;
} }