diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2014-10-31 16:38:40 +0000 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-11-23 12:12:46 +0200 |
| commit | 0c0de1b681bc11a8ebc94bd45e99d6f4e8fafd80 (patch) | |
| tree | 6947191cb313f59b2cbd36e59c99a36e5e346c56 | |
| parent | 91aa70ab2a748e3a72004d1a729248221b7bb24a (diff) | |
pc: pc-dimm: use backend alignment during address auto allocation
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/mem/pc-dimm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 4944f0faf9..d431834030 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -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; |