Re: [Qemu-devel] [PATCH 2/2] Revert "memhp: extend address auto assignment to support gaps"

[Igor Mammedov]

On Wed, 28 Oct 2015 18:57:03 +0200
"Michael S. Tsirkin" <address@hidden> wrote:

> This reverts commit df0acded19ec4b826aa095cfc19d341bd66fafd3.
> 
> There's no point to it now that the only user has been reverted.
> 
> Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>

> ---
>  include/hw/mem/pc-dimm.h |  7 +++----
>  hw/i386/pc.c             |  3 +--
>  hw/mem/pc-dimm.c         | 15 ++++++---------
>  hw/ppc/spapr.c           |  2 +-
>  4 files changed, 11 insertions(+), 16 deletions(-)
> 
> diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
> index c1ee7b0..d83bf30 100644
> --- a/include/hw/mem/pc-dimm.h
> +++ b/include/hw/mem/pc-dimm.h
> @@ -83,16 +83,15 @@ typedef struct MemoryHotplugState {
>  
>  uint64_t pc_dimm_get_free_addr(uint64_t address_space_start,
>                                 uint64_t address_space_size,
> -                               uint64_t *hint, uint64_t align, bool
> gap,
> -                               uint64_t size, Error **errp);
> +                               uint64_t *hint, uint64_t align,
> uint64_t size,
> +                               Error **errp);
>  
>  int pc_dimm_get_free_slot(const int *hint, int max_slots, Error
> **errp); 
>  int qmp_pc_dimm_device_list(Object *obj, void *opaque);
>  uint64_t pc_existing_dimms_capacity(Error **errp);
>  void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms,
> -                         MemoryRegion *mr, uint64_t align, bool gap,
> -                         Error **errp);
> +                         MemoryRegion *mr, uint64_t align, Error
> **errp); void pc_dimm_memory_unplug(DeviceState *dev,
> MemoryHotplugState *hpms, MemoryRegion *mr);
>  #endif
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index b1800fc..4bc5640 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1629,8 +1629,7 @@ static void pc_dimm_plug(HotplugHandler
> *hotplug_dev, goto out;
>      }
>  
> -    pc_dimm_memory_plug(dev, &pcms->hotplug_memory, mr, align, false,
> -                        &local_err);
> +    pc_dimm_memory_plug(dev, &pcms->hotplug_memory, mr, align,
> &local_err); if (local_err) {
>          goto out;
>      }
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index 2bae994..80f424b 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -33,8 +33,7 @@ typedef struct pc_dimms_capacity {
>  } pc_dimms_capacity;
>  
>  void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms,
> -                         MemoryRegion *mr, uint64_t align, bool gap,
> -                         Error **errp)
> +                         MemoryRegion *mr, uint64_t align, Error
> **errp) {
>      int slot;
>      MachineState *machine = MACHINE(qdev_get_machine());
> @@ -50,7 +49,7 @@ void pc_dimm_memory_plug(DeviceState *dev,
> MemoryHotplugState *hpms, 
>      addr = pc_dimm_get_free_addr(hpms->base,
>                                   memory_region_size(&hpms->mr),
> -                                 !addr ? NULL : &addr, align, gap,
> +                                 !addr ? NULL : &addr, align,
>                                   memory_region_size(mr), &local_err);
>      if (local_err) {
>          goto out;
> @@ -295,8 +294,8 @@ static int pc_dimm_built_list(Object *obj, void
> *opaque) 
>  uint64_t pc_dimm_get_free_addr(uint64_t address_space_start,
>                                 uint64_t address_space_size,
> -                               uint64_t *hint, uint64_t align, bool
> gap,
> -                               uint64_t size, Error **errp)
> +                               uint64_t *hint, uint64_t align,
> uint64_t size,
> +                               Error **errp)
>  {
>      GSList *list = NULL, *item;
>      uint64_t new_addr, ret = 0;
> @@ -341,15 +340,13 @@ uint64_t pc_dimm_get_free_addr(uint64_t
> address_space_start, goto out;
>          }
>  
> -        if (ranges_overlap(dimm->addr, dimm_size, new_addr,
> -                           size + (gap ? 1 : 0))) {
> +        if (ranges_overlap(dimm->addr, dimm_size, new_addr, size)) {
>              if (hint) {
>                  DeviceState *d = DEVICE(dimm);
>                  error_setg(errp, "address range conflicts with
> '%s'", d->id); goto out;
>              }
> -            new_addr = QEMU_ALIGN_UP(dimm->addr + dimm_size + (gap ?
> 1 : 0),
> -                                     align);
> +            new_addr = QEMU_ALIGN_UP(dimm->addr + dimm_size, align);
>          }
>      }
>      ret = new_addr;
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index d1b0e53..a9b5f2a 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2096,7 +2096,7 @@ static void spapr_memory_plug(HotplugHandler
> *hotplug_dev, DeviceState *dev, goto out;
>      }
>  
> -    pc_dimm_memory_plug(dev, &ms->hotplug_memory, mr, align, false,
> &local_err);
> +    pc_dimm_memory_plug(dev, &ms->hotplug_memory, mr, align,
> &local_err); if (local_err) {
>          goto out;
>      }