From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYPfX-00024e-EB for qemu-devel@nongnu.org; Wed, 18 Mar 2015 21:54:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYPfQ-0002FX-P5 for qemu-devel@nongnu.org; Wed, 18 Mar 2015 21:54:43 -0400 Received: from [59.151.112.132] (port=45913 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYPfQ-0002Ea-Cu for qemu-devel@nongnu.org; Wed, 18 Mar 2015 21:54:36 -0400 Message-ID: <550A2BFB.9070506@cn.fujitsu.com> Date: Thu, 19 Mar 2015 09:52:59 +0800 From: Zhu Guihua MIME-Version: 1.0 References: <849482771656da4717f071a85bd83e72e48f5ab0.1426494342.git.zhugh.fnst@cn.fujitsu.com> <20150316145713-mutt-send-email-mst@redhat.com> In-Reply-To: <20150316145713-mutt-send-email-mst@redhat.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit 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: "Michael S. Tsirkin" 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 03/16/2015 09:58 PM, Michael S. Tsirkin wrote: > 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. The new API will be used in several places. If I squash this with the user, I think the patch will be too large. So I think it is better to add documentation here. what's your opinion? Thanks, Zhu > > >> --- >> 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 > . >