aboutsummaryrefslogtreecommitdiff
path: root/hw/core/qdev.c
diff options
context:
space:
mode:
authorIgor Mammedov <imammedo@redhat.com>2014-09-26 09:28:19 +0000
committerAndreas Färber <afaerber@suse.de>2014-10-15 05:03:13 +0200
commit14d5a28fb6bb8ac6505ad1faca2690df56fef326 (patch)
treeaf0cc9cec7ee1c233fc1105d3c8769fcb1676b8c /hw/core/qdev.c
parentce9835e00df65bf5beb6c094c0865d8e60018310 (diff)
qdev: HotplugHandler: Rename unplug callback to unplug_request
'HotplugHandler.unplug' callback is currently used as async call to issue unplug request for device that implements it. Renaming 'unplug' callback to 'unplug_request' should help to avoid confusion about what callback does and would allow to introduce 'unplug' callback that would perform actual device removal when guest is ready for it. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/core/qdev.c')
-rw-r--r--hw/core/qdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index df97003289..87ed438475 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -227,7 +227,8 @@ void qdev_unplug(DeviceState *dev, Error **errp)
qdev_hot_removed = true;
if (dev->parent_bus && dev->parent_bus->hotplug_handler) {
- hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev, errp);
+ hotplug_handler_unplug_request(dev->parent_bus->hotplug_handler,
+ dev, errp);
} else {
assert(dc->unplug != NULL);
if (dc->unplug(dev) < 0) { /* legacy handler */