On Wed, 26 Sep 2018 11:42:08 +0200
David Hildenbrand <da...@redhat.com> wrote:
> With all required memory device class functions in place, we can factor
> out pre_plug handling of memory devices. Take proper care of errors. We
> still have to carry along legacy_align required for pc compatibility
> handling.
>
> We will factor out tracing of the address separately in a follow-up
> patch.
>
> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> ---
> hw/mem/memory-device.c | 32 +++++++++++++++++++++++++++++---
> hw/mem/pc-dimm.c | 15 +++------------
> include/hw/mem/memory-device.h | 5 ++---
> 3 files changed, 34 insertions(+), 18 deletions(-)
>
> diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
> index 9beaad1dba..54e3f23b15 100644
> --- a/hw/mem/memory-device.c
> +++ b/hw/mem/memory-device.c
> @@ -94,9 +94,10 @@ static void memory_device_check_addable(MachineState *ms,
> uint64_t size,
>
> }
>
> -uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
> - uint64_t align, uint64_t size,
> - Error **errp)
> +static uint64_t memory_device_get_free_addr(MachineState *ms,
> + const uint64_t *hint,
> + uint64_t align, uint64_t size,
> + Error **errp)
> {
> uint64_t address_space_start, address_space_end;
> GSList *list = NULL, *item;
> @@ -249,6 +250,31 @@ uint64_t get_plugged_memory_size(void)
> return size;
> }
>
> +void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
> + const uint64_t *legacy_align, Error **errp)
> +{
> + const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
> + Error *local_err = NULL;
> + uint64_t addr, align;
> + MemoryRegion *mr;
> +
> + mr = mdc->get_memory_region(md, &local_err);
> + if (local_err) {
> + goto out;
> + }
> +
> + align = legacy_align ? *legacy_align : memory_region_get_alignment(mr);
> + addr = mdc->get_addr(md);
> + addr = memory_device_get_free_addr(ms, !addr ? NULL : &addr, align,
> + memory_region_size(mr), &local_err);
> + if (local_err) {
> + goto out;
> + }
> + mdc->set_addr(md, addr, &local_err);
> +out:
> + error_propagate(errp, local_err);
> +}
> +
> void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
> uint64_t addr)
> {
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index 5873172175..ea9968e379 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -32,11 +32,9 @@ static int pc_dimm_get_free_slot(const int *hint, int
> max_slots, Error **errp);
> void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,
> const uint64_t *legacy_align, Error **errp)
> {
> - MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(dimm);
> DeviceState *dev = DEVICE(dimm);
> Error *local_err = NULL;
> - MemoryRegion *mr;
> - uint64_t addr, align;
> + uint64_t addr;
> int slot;
>
> slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
> @@ -49,22 +47,15 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState
> *machine,
> object_property_set_int(OBJECT(dev), slot, PC_DIMM_SLOT_PROP,
> &error_abort);
> trace_mhp_pc_dimm_assigned_slot(slot);
>
> - mr = mdc->get_memory_region(MEMORY_DEVICE(dev), &local_err);
> + memory_device_pre_plug(MEMORY_DEVICE(dev), machine, legacy_align,
> + &local_err);
> if (local_err) {
> goto out;
> }
>
> - align = legacy_align ? *legacy_align : memory_region_get_alignment(mr);
> addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP,
> &error_abort);
> - addr = memory_device_get_free_addr(machine, !addr ? NULL : &addr, align,
> - memory_region_size(mr), &local_err);
> - if (local_err) {
> - goto out;
> - }
> trace_mhp_pc_dimm_assigned_address(addr);
> - object_property_set_uint(OBJECT(dev), addr, PC_DIMM_ADDR_PROP,
> - &error_abort);
> out:
> error_propagate(errp, local_err);
> }
> diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
> index 6395942b27..df48b85285 100644
> --- a/include/hw/mem/memory-device.h
> +++ b/include/hw/mem/memory-device.h
> @@ -61,9 +61,8 @@ typedef struct MemoryDeviceClass {
>
> MemoryDeviceInfoList *qmp_memory_device_list(void);
> uint64_t get_plugged_memory_size(void);
> -uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
> - uint64_t align, uint64_t size,
> - Error **errp);
> +void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
> + const uint64_t *legacy_align, Error **errp);
> void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
> uint64_t addr);
> void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr);
