From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55299) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YS7ic-000327-1I for qemu-devel@nongnu.org; Sun, 01 Mar 2015 12:31:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YS7iY-0008De-Qf for qemu-devel@nongnu.org; Sun, 01 Mar 2015 12:31:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YS7iY-0008DU-Hy for qemu-devel@nongnu.org; Sun, 01 Mar 2015 12:31:50 -0500 Date: Sun, 1 Mar 2015 18:31:39 +0100 From: "Michael S. Tsirkin" Message-ID: <20150301173139.GG8233@redhat.com> References: <26bd642f7692697d24cc6c8ffae8bb4b2cc94e7b.1424912878.git.zhugh.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <26bd642f7692697d24cc6c8ffae8bb4b2cc94e7b.1424912878.git.zhugh.fnst@cn.fujitsu.com> Subject: Re: [Qemu-devel] [PATCH v3 02/10] 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: 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 Thu, Feb 26, 2015 at 09:16:44AM +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 Same comments as everywhere: include implementation with users. In this case, I can't tell whether error_setg is appropriate since I don't know whether the error ever comes from user. > --- > hw/acpi/memory_hotplug.c | 26 +++++++++++++++++++------- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > index c6580da..6d91a0d 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_get_slot_status_descriptor: " > "device [%s] returned invalid memory slot[%d]", > - dev_path, slot); > + 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