From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPW6P-0006F0-69 for qemu-devel@nongnu.org; Thu, 04 Sep 2014 08:25:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPW6K-0003Pt-Hq for qemu-devel@nongnu.org; Thu, 04 Sep 2014 08:25:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPW6K-0003Ot-BD for qemu-devel@nongnu.org; Thu, 04 Sep 2014 08:25:20 -0400 Date: Thu, 4 Sep 2014 14:25:12 +0200 From: Igor Mammedov Message-ID: <20140904142512.51a00429@nial.usersys.redhat.com> In-Reply-To: <1409126919-22233-3-git-send-email-tangchen@cn.fujitsu.com> References: <1409126919-22233-1-git-send-email-tangchen@cn.fujitsu.com> <1409126919-22233-3-git-send-email-tangchen@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RESEND PATCH v3 2/8] acpi, ich9: Add memory hot unplug support for ich9. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Tang Chen Cc: zhugh.fnst@cn.fujitsu.com, mst@redhat.com, hutao@cn.fujitsu.com, qemu-devel@nongnu.org, isimatu.yasuaki@jp.fujitsu.com, pbonzini@redhat.com On Wed, 27 Aug 2014 16:08:33 +0800 Tang Chen 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 > --- > 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 */