From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXVXH-0005Uq-4q for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:58:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YXVXG-0006a5-3i for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:58:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YXVXF-0006Zx-UW for qemu-devel@nongnu.org; Mon, 16 Mar 2015 09:58:26 -0400 Date: Mon, 16 Mar 2015 14:58:21 +0100 From: "Michael S. Tsirkin" Message-ID: <20150316145713-mutt-send-email-mst@redhat.com> References: <849482771656da4717f071a85bd83e72e48f5ab0.1426494342.git.zhugh.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <849482771656da4717f071a85bd83e72e48f5ab0.1426494342.git.zhugh.fnst@cn.fujitsu.com> Subject: Re: [Qemu-devel] [RESEND PATCH v4 1/6] acpi, mem-hotplug: Add acpi_memory_slot_status() to get MemStatus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Zhu Guihua Cc: qemu-devel@nongnu.org, tangchen@cn.fujitsu.com, pbonzini@redhat.com, izumi.taku@jp.fujitsu.com, guz.fnst@cn.fujitsu.com, imammedo@redhat.com On Mon, Mar 16, 2015 at 04:58:13PM +0800, Zhu Guihua wrote: > From: Tang Chen > > Add a new API named acpi_memory_slot_status() to obtain a single memory > slot status. Doing this is because this procedure will be used by other > functions in the next coming patches. > > Signed-off-by: Tang Chen > Signed-off-by: Zhu Guihua It's generally only OK to add API in a separate patch from its use if the API is well documented. There's 0 documentation here, so please just squash this with the user so one can review without jumping back and forth. > --- > hw/acpi/memory_hotplug.c | 24 ++++++++++++++++++------ > 1 file changed, 18 insertions(+), 6 deletions(-) > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > index c6580da..0efc357 100644 > --- a/hw/acpi/memory_hotplug.c > +++ b/hw/acpi/memory_hotplug.c > @@ -163,29 +163,41 @@ void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner, > memory_region_add_subregion(as, ACPI_MEMORY_HOTPLUG_BASE, &state->io); > } > > -void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > - DeviceState *dev, Error **errp) > +static MemStatus * > +acpi_memory_slot_status(MemHotplugState *mem_st, > + DeviceState *dev, Error **errp) > { > - MemStatus *mdev; > Error *local_err = NULL; > int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, > &local_err); > > if (local_err) { > error_propagate(errp, local_err); > - return; > + return NULL; > } > > if (slot >= mem_st->dev_count) { > char *dev_path = object_get_canonical_path(OBJECT(dev)); > - error_setg(errp, "acpi_memory_plug_cb: " > + error_setg(errp, "acpi_memory_slot_status: " > "device [%s] returned invalid memory slot[%d]", > dev_path, slot); > g_free(dev_path); > + return NULL; > + } > + > + return &mem_st->devs[slot]; > +} > + > +void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > + DeviceState *dev, Error **errp) > +{ > + MemStatus *mdev; > + > + mdev = acpi_memory_slot_status(mem_st, dev, errp); > + if (!mdev) { > return; > } > > - mdev = &mem_st->devs[slot]; > mdev->dimm = dev; > mdev->is_enabled = true; > mdev->is_inserting = true; > -- > 1.9.3