From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzjyD-0002Tz-D4 for qemu-devel@nongnu.org; Wed, 25 Jun 2014 05:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wzjy8-0007g0-45 for qemu-devel@nongnu.org; Wed, 25 Jun 2014 05:58:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wzjy7-0007fr-Sm for qemu-devel@nongnu.org; Wed, 25 Jun 2014 05:58:20 -0400 From: Igor Mammedov Date: Wed, 25 Jun 2014 11:58:09 +0200 Message-Id: <1403690289-1354-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH] 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: hutao@cn.fujitsu.com, mst@redhat.com 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 --- hw/mem/pc-dimm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index ad176b7..991f0f8 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -146,7 +146,12 @@ 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, enable it on startup"); + goto out; + } + + assert(address_space_end > address_space_start); object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &list); if (hint) { -- 1.7.1