From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzlV8-00025V-CV for qemu-devel@nongnu.org; Wed, 25 Jun 2014 07:36:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzlV3-0008DV-35 for qemu-devel@nongnu.org; Wed, 25 Jun 2014 07:36:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25741) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzlV2-0008DL-Q2 for qemu-devel@nongnu.org; Wed, 25 Jun 2014 07:36:25 -0400 Date: Wed, 25 Jun 2014 13:36:19 +0200 From: Igor Mammedov Message-ID: <20140625133619.3ac262c6@nial.usersys.redhat.com> In-Reply-To: <20140625100302.GC8022@G08FNSTD100614.fnst.cn.fujitsu.com> References: <1403690289-1354-1-git-send-email-imammedo@redhat.com> <20140625100302.GC8022@G08FNSTD100614.fnst.cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [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: Hu Tao Cc: qemu-devel@nongnu.org, mst@redhat.com On Wed, 25 Jun 2014 18:03:02 +0800 Hu Tao wrote: > On Wed, Jun 25, 2014 at 11:58:09AM +0200, Igor Mammedov wrote: > > 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"); > > I'm just thinking if it's more clear to user to explictly state -m maxmem,slots here. > As there is little chance -m will change in the future for > compatibility, sync with it here won't be a problem. What do you think? Ok, maybe like mst've suggested: "memory hotplug is not enabled, please add maxmem option" > > Hu > > > + 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