summaryrefslogtreecommitdiffstats
path: root/hw/core/hotplug.c
diff options
context:
space:
mode:
authorIgor Mammedov2014-09-26 11:28:19 +0200
committerAndreas Färber2014-10-15 05:03:13 +0200
commit14d5a28fb6bb8ac6505ad1faca2690df56fef326 (patch)
treeaf0cc9cec7ee1c233fc1105d3c8769fcb1676b8c /hw/core/hotplug.c
parentqdev: do not allow to instantiate non hotpluggable device with device_add (diff)
downloadqemu-14d5a28fb6bb8ac6505ad1faca2690df56fef326.tar.gz
qemu-14d5a28fb6bb8ac6505ad1faca2690df56fef326.tar.xz
qemu-14d5a28fb6bb8ac6505ad1faca2690df56fef326.zip
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/hotplug.c')
-rw-r--r--hw/core/hotplug.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c
index 5573d9d2d9..2ec4736593 100644
--- a/hw/core/hotplug.c
+++ b/hw/core/hotplug.c
@@ -23,14 +23,14 @@ void hotplug_handler_plug(HotplugHandler *plug_handler,
}
}
-void hotplug_handler_unplug(HotplugHandler *plug_handler,
- DeviceState *plugged_dev,
- Error **errp)
+void hotplug_handler_unplug_request(HotplugHandler *plug_handler,
+ DeviceState *plugged_dev,
+ Error **errp)
{
HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler);
- if (hdc->unplug) {
- hdc->unplug(plug_handler, plugged_dev, errp);
+ if (hdc->unplug_request) {
+ hdc->unplug_request(plug_handler, plugged_dev, errp);
}
}