On Wed, 4 Feb 2015 10:51:16 +0800
Zhu Guihua <zhugh.f...@cn.fujitsu.com> wrote:
> From: Tang Chen <tangc...@cn.fujitsu.com>
>
> Add a new API named acpi_memory_get_slot_status_descriptor() 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 <tangc...@cn.fujitsu.com>
> Signed-off-by: Zhu Guihua <zhugh.f...@cn.fujitsu.com>
> ---
> hw/acpi/memory_hotplug.c | 27 +++++++++++++++++++--------
> 1 file changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
> index c6580da..ddbe01b 100644
> --- a/hw/acpi/memory_hotplug.c
> +++ b/hw/acpi/memory_hotplug.c
> @@ -163,29 +163,40 @@ 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;
> + return NULL;
> }
>
> - mdev = &mem_st->devs[slot];
> + 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;
run patches through scripts/checkpatch.pl
> +
> mdev->dimm = dev;
> mdev->is_enabled = true;
> mdev->is_inserting = true;
