From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42744)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X1Z6a-00075c-Pg
	for qemu-devel@nongnu.org; Mon, 30 Jun 2014 06:46:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X1Z6W-0002JW-2w
	for qemu-devel@nongnu.org; Mon, 30 Jun 2014 06:46:36 -0400
Received: from mx1.redhat.com ([209.132.183.28]:35577)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X1Z6V-0002IX-Qi
	for qemu-devel@nongnu.org; Mon, 30 Jun 2014 06:46:31 -0400
Date: Mon, 30 Jun 2014 13:46:55 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140630104654.GB19960@redhat.com>
References: <1404125009-14780-1-git-send-email-imammedo@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1404125009-14780-1-git-send-email-imammedo@redhat.com>
Subject: Re: [Qemu-devel] [PATCH for-2.1 v2] pc-dimm: error out if memory
 hotplug is not enabled
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Igor Mammedov <imammedo@redhat.com>
Cc: hutao@cn.fujitsu.com, qemu-devel@nongnu.org

On Mon, Jun 30, 2014 at 12:43:29PM +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 <imammedo@redhat.com>
> Reported-by:  Hu Tao <hutao@cn.fujitsu.com>

Applied, thanks.

> ---
> v2:
>  - amend error message
> ---
>  hw/mem/pc-dimm.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
> 
> 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) {
> -- 
> 1.7.1