From patchwork Wed Jun 3 15:10:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 480009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 856AF140271 for ; Thu, 4 Jun 2015 01:11:24 +1000 (AEST) Received: from localhost ([::1]:36118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0AKA-0003mF-Eo for incoming@patchwork.ozlabs.org; Wed, 03 Jun 2015 11:11:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0AJg-0003E4-G8 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 11:10:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0AJb-00027K-7L for qemu-devel@nongnu.org; Wed, 03 Jun 2015 11:10:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0AJb-000270-1Y for qemu-devel@nongnu.org; Wed, 03 Jun 2015 11:10:47 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 4FC803582DF for ; Wed, 3 Jun 2015 15:10:46 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t53FAjVD027672; Wed, 3 Jun 2015 11:10:45 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 3 Jun 2015 17:10:43 +0200 Message-Id: <1433344243-39420-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH] pc-dimm: don't assert if pc-dimm alignment != hotpluggable mem range size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Drop superfluous pc-dimm alignment on hot-pluggable mem range size assert, since it causes QEMU crash during hotplug when hotplugging pc-dimm with alignment bigger than an alignment of hot-pluggable mem range size. Instead allow pc_dimm_get_free_addr() find free address and bail out gracefully later in that function during checking if pc-dimm will fit in hot-pluggable mem range. Signed-off-by: Igor Mammedov --- hw/mem/pc-dimm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 482a7a0..6315ce2 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -224,7 +224,6 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, 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, "