From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFED-0006al-BR for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:39:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XkFE6-0002iB-M0 for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:39:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkFE6-0002hn-89 for qemu-devel@nongnu.org; Fri, 31 Oct 2014 12:39:02 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9VGd19X029458 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 31 Oct 2014 12:39:01 -0400 From: Igor Mammedov Date: Fri, 31 Oct 2014 16:38:40 +0000 Message-Id: <1414773522-7756-10-git-send-email-imammedo@redhat.com> In-Reply-To: <1414773522-7756-1-git-send-email-imammedo@redhat.com> References: <1414773522-7756-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 09/11] 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: pbonzini@redhat.com, mst@redhat.com Signed-off-by: Igor Mammedov --- 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; -- 1.8.3.1