From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGNXV-0003vP-Qz for qemu-devel@nongnu.org; Wed, 28 Jan 2015 02:59:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGNXR-0006zE-RO for qemu-devel@nongnu.org; Wed, 28 Jan 2015 02:59:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGNXR-0006z2-Jb for qemu-devel@nongnu.org; Wed, 28 Jan 2015 02:59:49 -0500 Date: Wed, 28 Jan 2015 09:59:39 +0200 From: "Michael S. Tsirkin" Message-ID: <20150128075939.GA16698@redhat.com> References: <37dc591681ce4e99d5e651e47f18ae1937d267f6.1422429010.git.zhugh.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <37dc591681ce4e99d5e651e47f18ae1937d267f6.1422429010.git.zhugh.fnst@cn.fujitsu.com> Subject: Re: [Qemu-devel] [PATCH v2 2/5] acpi, ich9: Add hotunplug request cb for ich9. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Zhu Guihua Cc: hutao@cn.fujitsu.com, qemu-devel@nongnu.org, tangchen@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, pbonzini@redhat.com, guz.fnst@cn.fujitsu.com, imammedo@redhat.com On Wed, Jan 28, 2015 at 03:45:38PM +0800, Zhu Guihua wrote: > From: Tang Chen > > Memory and CPU hot unplug are both asynchronous procedures. > 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 share it. > > Reviewed-by: Igor Mammedov > Signed-off-by: Tang Chen > Signed-off-by: Zhu Guihua > --- > 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 884dab3..5fe1eb8 100644 > --- a/hw/acpi/ich9.c > +++ b/hw/acpi/ich9.c > @@ -397,6 +397,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" s/not supported/unsupported/ don't respin just for this. > + " 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 12d7a7a..eaef0c3 100644 > --- a/include/hw/acpi/ich9.h > +++ b/include/hw/acpi/ich9.h > @@ -63,6 +63,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 */ > -- > 1.9.3