From patchwork Wed Jun 25 09:01:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 363895 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 6F1BE1400DC for ; Wed, 25 Jun 2014 19:03:38 +1000 (EST) Received: from localhost ([::1]:36115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wzj7A-0001aF-MV for incoming@patchwork.ozlabs.org; Wed, 25 Jun 2014 05:03:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wzj6q-0001Hj-Az for qemu-devel@nongnu.org; Wed, 25 Jun 2014 05:03:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wzj6l-0004Sf-A5 for qemu-devel@nongnu.org; Wed, 25 Jun 2014 05:03:16 -0400 Received: from [59.151.112.132] (port=30570 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wzj6k-0004O2-T4 for qemu-devel@nongnu.org; Wed, 25 Jun 2014 05:03:11 -0400 X-IronPort-AV: E=Sophos;i="5.00,775,1396972800"; d="scan'208";a="32407906" Received: from localhost (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 25 Jun 2014 17:00:21 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id s5P930B4013633; Wed, 25 Jun 2014 17:03:00 +0800 Received: from G08FNSTD100614.fnst.cn.fujitsu.com (10.167.226.102) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 25 Jun 2014 17:03:05 +0800 From: Hu Tao To: Date: Wed, 25 Jun 2014 17:01:04 +0800 Message-ID: <1403686864-13567-1-git-send-email-hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 MIME-Version: 1.0 X-Originating-IP: [10.167.226.102] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Yasunori Goto , Igor Mammedov , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH] check if we have space left for hotplugged memory 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 If pc-dimm is specified on qemu command line, but only with -m size (aka not -m size,maxmem,slots) then qemu will core dump. This patch fixes the problem. Signed-off-by: Hu Tao --- hw/i386/pc.c | 5 +++++ hw/mem/pc-dimm.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2cf22b1..1a0d96e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1566,6 +1566,11 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev, goto out; } + if (memory_region_size(&pcms->hotplug_memory) == 0) { + error_setg(&local_err, "no space left for hotplugged memory."); + goto out; + } + addr = pc_dimm_get_free_addr(pcms->hotplug_memory_base, memory_region_size(&pcms->hotplug_memory), !addr ? NULL : &addr, diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index ad176b7..59ed9c0 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -146,6 +146,11 @@ 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; + if (address_space_size == 0) { + error_setg(errp, "no space left for hotplugged memory."); + goto out; + } + assert(address_space_end > address_space_size); object_child_foreach(qdev_get_machine(), pc_dimm_built_list, &list);