Hi David,
On 9/26/18 11:42 AM, David Hildenbrand wrote:
> With the new memory device functions in place, we can factor out
> unplugging of memory devices completely.
>
> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
> ---
> hw/mem/memory-device.c | 11 +++++++++--
> hw/mem/pc-dimm.c | 5 +----
> include/hw/mem/memory-device.h | 2 +-
> 3 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
> index 3914e2fe6f..e8e282bf5e 100644
> --- a/hw/mem/memory-device.c
> +++ b/hw/mem/memory-device.c
> @@ -292,9 +292,16 @@ void memory_device_plug(MemoryDeviceState *md,
> MachineState *ms)
> addr - ms->device_memory->base, mr);
> }
>
> -void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr)
> +void memory_device_unplug(MemoryDeviceState *md, MachineState *ms)
> {
> - /* we expect a previous call to memory_device_get_free_addr() */
> + const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
> + MemoryRegion *mr;
> +
> + /*
> + * We expect a previous call to memory_device_pre_plug() succeeded so
> + * it and can't fail at this point.
s/it and/it
Reviewed-by: Eric Auger <eric.au...@redhat.com>
Thanks
Eric
> + */
> + mr = mdc->get_memory_region(md, &error_abort);
> g_assert(ms->device_memory);
>
> memory_region_del_subregion(&ms->device_memory->mr, mr);
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index 07fa29a748..5a9a3d831d 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -73,13 +73,10 @@ void pc_dimm_plug(PCDIMMDevice *dimm, MachineState
> *machine, Error **errp)
> void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine)
> {
> PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
> - MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(dimm);
> MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,
> &error_abort);
> - MemoryRegion *mr = mdc->get_memory_region(MEMORY_DEVICE(dimm),
> - &error_abort);
>
> - memory_device_unplug_region(machine, mr);
> + memory_device_unplug(MEMORY_DEVICE(dimm), machine);
> vmstate_unregister_ram(vmstate_mr, DEVICE(dimm));
> }
>
> diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
> index 8b58529843..97de693bca 100644
> --- a/include/hw/mem/memory-device.h
> +++ b/include/hw/mem/memory-device.h
> @@ -64,7 +64,7 @@ uint64_t get_plugged_memory_size(void);
> void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
> const uint64_t *legacy_align, Error **errp);
> void memory_device_plug(MemoryDeviceState *md, MachineState *ms);
> -void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr);
> +void memory_device_unplug(MemoryDeviceState *md, MachineState *ms);
> uint64_t memory_device_get_region_size(const MemoryDeviceState *md,
> Error **errp);
>
>
