Commit d6a9b0b8 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

Revert "memhp: extend address auto assignment to support gaps" 



This reverts commit df0acded.

There's no point to it now that the only user has been reverted.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 340065e5

hw/i386/pc.c

+1 −2
Original line number Diff line number Diff line
@@ -1631,8 +1631,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;

    }

hw/mem/pc-dimm.c

+6 −9
Original line number Diff line number Diff line
@@ -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;

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -2157,7 +2157,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;

    }

include/hw/mem/pc-dimm.h

+3 −4
Original line number Diff line number Diff line
@@ -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