From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X48BW-0003Z0-Bl for qemu-devel@nongnu.org; Mon, 07 Jul 2014 08:38:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X48BR-0000Z5-23 for qemu-devel@nongnu.org; Mon, 07 Jul 2014 08:38:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X48BQ-0000Yk-PC for qemu-devel@nongnu.org; Mon, 07 Jul 2014 08:38:12 -0400 Date: Mon, 7 Jul 2014 15:40:10 +0300 From: "Michael S. Tsirkin" Message-ID: <1404711994-18228-4-git-send-email-mst@redhat.com> References: <1404711994-18228-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1404711994-18228-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 03/12] pc-dimm: error out if memory hotplug is not enabled List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , Hu Tao , Vasilis Liaskovitis , Anthony Liguori , Igor Mammedov From: Igor Mammedov fixes QEMU abort in case it's started without memory hotplug enabled. as result of fix it will print following messages: " -device pc-dimm,id=d1,memdev=m1: memory hotplug is not enabled, enable it on startup -device pc-dimm,id=d1,memdev=m1: Device 'pc-dimm' could not be initialized " Also fixup assert condition to detect hotplug address space overflow. Signed-off-by: Igor Mammedov Reported-by: Hu Tao Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/mem/pc-dimm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index ad176b7..08f49ed 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -146,7 +146,13 @@ 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; - assert(address_space_end > address_space_size); + if (!address_space_size) { + error_setg(errp, "memory hotplug is not enabled, " + "please add maxmem option"); + goto out; + } + + assert(address_space_end > address_space_start); object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &list); if (hint) { -- MST