From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYwRD-0004tH-2I for qemu-devel@nongnu.org; Tue, 30 Sep 2014 08:21:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYwR8-0001z5-95 for qemu-devel@nongnu.org; Tue, 30 Sep 2014 08:21:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYwR7-0001yd-SZ for qemu-devel@nongnu.org; Tue, 30 Sep 2014 08:21:46 -0400 Date: Tue, 30 Sep 2014 12:40:10 +0300 From: "Michael S. Tsirkin" Message-ID: <1412069893-4717-5-git-send-email-mst@redhat.com> References: <1412069893-4717-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1412069893-4717-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 4/5] pc-dimm: Don't check dimm->node when there is non-NUMA config List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , zhanghailiang , Hu Tao , Anthony Liguori , Igor Mammedov From: zhanghailiang It should not break memory hotplug feature if there is non-NUMA option. This patch would also allow to use pc-dimm as replacement for initial memory for non-NUMA configs. Note: After this patch, the memory hotplug can work normally for Linux guest OS when there is non-NUMA option and NUMA option. But not support Windows guest OS to hotplug memory with no-NUMA config, actully, it's Windows limitation. Reviewed-By: Igor Mammedov Signed-off-by: zhanghailiang Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/mem/pc-dimm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 5bfc5b7..a800ea7 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -252,7 +252,7 @@ static void pc_dimm_realize(DeviceState *dev, Error **errp) error_setg(errp, "'" PC_DIMM_MEMDEV_PROP "' property is not set"); return; } - if (dimm->node >= nb_numa_nodes) { + if ((nb_numa_nodes > 0) && (dimm->node >= nb_numa_nodes)) { error_setg(errp, "'DIMM property " PC_DIMM_NODE_PROP " has value %" PRIu32 "' which exceeds the number of numa nodes: %d", dimm->node, nb_numa_nodes); -- MST