On Wed, 27 Aug 2014 16:08:33 +0800
Tang Chen <tangc...@cn.fujitsu.com> wrote:
> Implement ich9_pm_device_unplug_cb() to support memory hot-remove,
> calling acpi_memory_unplug_cb(). And itself will be called in
> ich9_device_unplug_cb().
>
> Signed-off-by: Tang Chen <tangc...@cn.fujitsu.com>
> ---
> hw/acpi/ich9.c | 12 ++++++++++++
> hw/isa/lpc_ich9.c | 5 +++--
> include/hw/acpi/ich9.h | 2 ++
> 3 files changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index 7b14bbb..d369151 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -310,6 +310,18 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm,
> DeviceState *dev, Error **errp)
> }
> }
>
> +void ich9_pm_device_unplug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error
> **errp)
> +{
> + if (pm->acpi_memory_hotplug.is_enabled &&
why checking ^^^^^^^^^^^ here but not doing so in piix4 too?
> + object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + acpi_memory_unplug_cb(&pm->acpi_regs, pm->irq,
> &pm->acpi_memory_hotplug,
> + dev, errp);
> + } else {
> + error_setg(errp, "acpi: device unplug request for not supported
> device"
> + " type: %s", object_get_typename(OBJECT(dev)));
> + }
> +}
> +
> void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list)
> {
> ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
> diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
> index 177023b..2c0761a 100644
> --- a/hw/isa/lpc_ich9.c
> +++ b/hw/isa/lpc_ich9.c
> @@ -610,8 +610,9 @@ static void ich9_device_plug_cb(HotplugHandler
> *hotplug_dev,
> static void ich9_device_unplug_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)));
> + ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
> +
> + ich9_pm_device_unplug_cb(&lpc->pm, dev, errp);
> }
>
> static bool ich9_rst_cnt_needed(void *opaque)
> diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> index 7e42448..029576f 100644
> --- a/include/hw/acpi/ich9.h
> +++ b/include/hw/acpi/ich9.h
> @@ -60,6 +60,8 @@ extern const VMStateDescription vmstate_ich9_pm;
> 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_unplug_cb(ICH9LPCPMRegs *pm, DeviceState *dev,
> + Error **errp);
>
> void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list);
> #endif /* HW_ACPI_ICH9_H */
