acpi, ich9: Add unplug cb for ich9.
Memory and CPU hot unplug are both asynchronous procedures. When the unplug operation happens, unplug request cb is called first. And when guest OS finished handling unplug, unplug cb will be called to do the real removal of device. This patch adds hotunplug cb to ich9, which memory and CPU hot unplug will use it. Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
232391c19e
commit
91a734a6fa
|
@ -404,6 +404,13 @@ void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
|
||||||
" type: %s", object_get_typename(OBJECT(dev)));
|
" type: %s", object_get_typename(OBJECT(dev)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ich9_pm_device_unplug_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
error_setg(errp, "acpi: device unplug for not supported device"
|
||||||
|
" type: %s", object_get_typename(OBJECT(dev)));
|
||||||
|
}
|
||||||
|
|
||||||
void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
|
void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
|
||||||
{
|
{
|
||||||
ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
|
ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
|
||||||
|
|
|
@ -615,6 +615,14 @@ static void ich9_device_unplug_request_cb(HotplugHandler *hotplug_dev,
|
||||||
ich9_pm_device_unplug_request_cb(&lpc->pm, dev, errp);
|
ich9_pm_device_unplug_request_cb(&lpc->pm, dev, errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void ich9_device_unplug_cb(HotplugHandler *hotplug_dev,
|
||||||
|
DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
|
||||||
|
|
||||||
|
ich9_pm_device_unplug_cb(&lpc->pm, dev, errp);
|
||||||
|
}
|
||||||
|
|
||||||
static bool ich9_rst_cnt_needed(void *opaque)
|
static bool ich9_rst_cnt_needed(void *opaque)
|
||||||
{
|
{
|
||||||
ICH9LPCState *lpc = opaque;
|
ICH9LPCState *lpc = opaque;
|
||||||
|
@ -678,6 +686,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data)
|
||||||
dc->cannot_instantiate_with_device_add_yet = true;
|
dc->cannot_instantiate_with_device_add_yet = true;
|
||||||
hc->plug = ich9_device_plug_cb;
|
hc->plug = ich9_device_plug_cb;
|
||||||
hc->unplug_request = ich9_device_unplug_request_cb;
|
hc->unplug_request = ich9_device_unplug_request_cb;
|
||||||
|
hc->unplug = ich9_device_unplug_cb;
|
||||||
adevc->ospm_status = ich9_pm_ospm_status;
|
adevc->ospm_status = ich9_pm_ospm_status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,6 +65,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp);
|
||||||
void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp);
|
void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp);
|
||||||
void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
|
void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
|
||||||
Error **errp);
|
Error **errp);
|
||||||
|
void ich9_pm_device_unplug_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
|
||||||
|
Error **errp);
|
||||||
|
|
||||||
void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list);
|
void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list);
|
||||||
#endif /* HW_ACPI_ICH9_H */
|
#endif /* HW_ACPI_ICH9_H */
|
||||||
|
|
Loading…
Reference in a new issue