Commit 0c0de1b6 authored by Igor Mammedov's avatar Igor Mammedov Committed by Michael S. Tsirkin
Browse files

pc: pc-dimm: use backend alignment during address auto allocation 



Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 91aa70ab

hw/mem/pc-dimm.c

+4 −1
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, 
    uint64_t new_addr, ret = 0;

    uint64_t address_space_end = address_space_start + address_space_size;



    g_assert(QEMU_ALIGN_UP(address_space_start, align) == address_space_start);

    g_assert(QEMU_ALIGN_UP(address_space_size, align) == address_space_size);



    if (!address_space_size) {

        error_setg(errp, "memory hotplug is not enabled, "

                         "please add maxmem option");
@@ -189,7 +192,7 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, 
                error_setg(errp, "address range conflicts with '%s'", d->id);

                goto out;

            }

            new_addr = dimm->addr + dimm_size;

            new_addr = QEMU_ALIGN_UP(dimm->addr + dimm_size, align);

        }

    }

    ret = new_addr;