| Message ID | 1420613385-13679-3-git-send-email-tangchen@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On Wed, 7 Jan 2015 14:49:42 +0800 Tang Chen <tangchen@cn.fujitsu.com> wrote: > Memory and CPU hot unplug are both asynchronize procedures. s/asynchronize/asynchronous/ > They both need unplug request cb when the unplug operation happens. > > This patch adds hotunplug request cb for ich9, and memory and CPU > hot unplug will base on it. s/base on it/share it/ > --- > hw/acpi/ich9.c | 7 +++++++ > hw/isa/lpc_ich9.c | 5 +++-- > include/hw/acpi/ich9.h | 2 ++ > 3 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > index ea991a3..5ce3aaf 100644 > --- a/hw/acpi/ich9.c > +++ b/hw/acpi/ich9.c > @@ -301,6 +301,13 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp) > } > } > > +void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev, > + Error **errp) > +{ > + 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 530b074..d00b223 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_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))); > + ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev); > + > + ich9_pm_device_unplug_request_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 fe975e6..86853c3 100644 > --- a/include/hw/acpi/ich9.h > +++ b/include/hw/acpi/ich9.h > @@ -59,6 +59,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_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev, > + Error **errp); > > void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list); > #endif /* HW_ACPI_ICH9_H */
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index ea991a3..5ce3aaf 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -301,6 +301,13 @@ void ich9_pm_device_plug_cb(ICH9LPCPMRegs *pm, DeviceState *dev, Error **errp) } } +void ich9_pm_device_unplug_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev, + Error **errp) +{ + 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 530b074..d00b223 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_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))); + ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev); + + ich9_pm_device_unplug_request_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 fe975e6..86853c3 100644 --- a/include/hw/acpi/ich9.h +++ b/include/hw/acpi/ich9.h @@ -59,6 +59,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_request_cb(ICH9LPCPMRegs *pm, DeviceState *dev, + Error **errp); void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list); #endif /* HW_ACPI_ICH9_H */