On Mon, 16 Mar 2015 16:58:15 +0800
Zhu Guihua <zhugh.f...@cn.fujitsu.com> wrote:
> From: Tang Chen <tangc...@cn.fujitsu.com>
>
> Implement memory unplug request cb for pc-dimm, and call it in
> pc_machine_device_unplug_request_cb().
Please, merge this patch with 2/6.
>
> Signed-off-by: Tang Chen <tangc...@cn.fujitsu.com>
> Signed-off-by: Zhu Guihua <zhugh.f...@cn.fujitsu.com>
> ---
> hw/i386/pc.c | 28 ++++++++++++++++++++++++++--
> 1 file changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index b5b2aad..9c7c318 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1669,6 +1669,26 @@ out:
> error_propagate(errp, local_err);
> }
>
> +static void pc_dimm_unplug_request(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + HotplugHandlerClass *hhc;
> + Error *local_err = NULL;
> + PCMachineState *pcms = PC_MACHINE(hotplug_dev);
> +
> + if (!pcms->acpi_dev) {
> + error_setg(&local_err,
> + "memory hotplug is not enabled: missing acpi device");
> + goto out;
> + }
> +
> + hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev);
> + hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);
> +
> +out:
> + error_propagate(errp, local_err);
> +}
> +
> static void pc_cpu_plug(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> @@ -1711,8 +1731,12 @@ static void pc_machine_device_plug_cb(HotplugHandler
> *hotplug_dev,
> static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error
> **errp)
> {
> - error_setg(errp, "acpi: device unplug request for not supported device"
> - " type: %s", object_get_typename(OBJECT(dev)));
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + pc_dimm_unplug_request(hotplug_dev, dev, errp);
> + } else {
> + error_setg(errp, "acpi: device unplug request for not supported
> device"
> + " type: %s", object_get_typename(OBJECT(dev)));
> + }
> }
>
> static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
