david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: hotplug: Introduce HotplugHandler.pre_plug() callback

Browse Source 
pre_plug callback is to be called before device.realize() is executed.
This would allow to check/set device's properties from HotplugHandler.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Igor Mammedov 2016-05-12 09:18:15 +05:30 committed by David Gibson
parent 2e11b15dff
commit 41346263c4
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/core/hotplug.c
View File

@ -13,6 +13,17 @@
#include "hw/hotplug.h" #include "hw/hotplug.h"
#include "qemu/module.h" #include "qemu/module.h"
void hotplug_handler_pre_plug(HotplugHandler *plug_handler,
DeviceState *plugged_dev,
Error **errp)
{
HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler);
if (hdc->pre_plug) {
hdc->pre_plug(plug_handler, plugged_dev, errp);
}
}
void hotplug_handler_plug(HotplugHandler *plug_handler, void hotplug_handler_plug(HotplugHandler *plug_handler,
DeviceState *plugged_dev, DeviceState *plugged_dev,
Error **errp) Error **errp)

9
hw/core/qdev.c
View File

@ -902,6 +902,14 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
g_free(name); g_free(name);
} }
hotplug_ctrl = qdev_get_hotplug_handler(dev);
if (hotplug_ctrl) {
hotplug_handler_pre_plug(hotplug_ctrl, dev, &local_err);
if (local_err != NULL) {
goto fail;
}
}
if (dc->realize) { if (dc->realize) {
dc->realize(dev, &local_err); dc->realize(dev, &local_err);
} }
@ -912,7 +920,6 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
DEVICE_LISTENER_CALL(realize, Forward, dev); DEVICE_LISTENER_CALL(realize, Forward, dev);
hotplug_ctrl = qdev_get_hotplug_handler(dev);
if (hotplug_ctrl) { if (hotplug_ctrl) {
hotplug_handler_plug(hotplug_ctrl, dev, &local_err); hotplug_handler_plug(hotplug_ctrl, dev, &local_err);
} }

14
include/hw/hotplug.h
View File

@ -45,7 +45,8 @@ typedef void (*hotplug_fn)(HotplugHandler *plug_handler,
* hardware (un)plug functions. * hardware (un)plug functions.
* *
* @parent: Opaque parent interface. * @parent: Opaque parent interface.
* @plug: plug callback. * @pre_plug: pre plug callback called at start of device.realize(true)
* @plug: plug callback called at end of device.realize(true).
* @unplug_request: unplug request callback. * @unplug_request: unplug request callback.
* Used as a means to initiate device unplug for devices that * Used as a means to initiate device unplug for devices that
* require asynchronous unplug handling. * require asynchronous unplug handling.
@ -58,6 +59,7 @@ typedef struct HotplugHandlerClass {
InterfaceClass parent; InterfaceClass parent;
/* <public> */ /* <public> */
hotplug_fn pre_plug;
hotplug_fn plug; hotplug_fn plug;
hotplug_fn unplug_request; hotplug_fn unplug_request;
hotplug_fn unplug; hotplug_fn unplug;
@ -72,6 +74,16 @@ void hotplug_handler_plug(HotplugHandler *plug_handler,
DeviceState *plugged_dev, DeviceState *plugged_dev,
Error **errp); Error **errp);
/**
* hotplug_handler_pre_plug:
*
* Call #HotplugHandlerClass.pre_plug callback of @plug_handler.
*/
void hotplug_handler_pre_plug(HotplugHandler *plug_handler,
DeviceState *plugged_dev,
Error **errp);
/** /**
* hotplug_handler_unplug_request: * hotplug_handler_unplug_request:
* *