From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XszMM-0002mD-CS for qemu-devel@nongnu.org; Mon, 24 Nov 2014 14:31:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XszMD-0001Ut-AT for qemu-devel@nongnu.org; Mon, 24 Nov 2014 14:31:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XszMD-0001Ud-2c for qemu-devel@nongnu.org; Mon, 24 Nov 2014 14:31:33 -0500 Date: Mon, 24 Nov 2014 21:31:09 +0200 From: "Michael S. Tsirkin" Message-ID: <1416855830-31740-8-git-send-email-mst@redhat.com> References: <1416855830-31740-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1416855830-31740-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 07/15] pc: pc-dimm: use backend alignment during address auto allocation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , Tang Chen , Anthony Liguori , Igor Mammedov From: Igor Mammedov Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/mem/pc-dimm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 4944f0f..d431834 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; -- MST