From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZH5IZ-00023e-1M for qemu-devel@nongnu.org; Mon, 20 Jul 2015 03:15:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZH5IT-0004Yt-Tn for qemu-devel@nongnu.org; Mon, 20 Jul 2015 03:15:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZH5IT-0004Ym-En for qemu-devel@nongnu.org; Mon, 20 Jul 2015 03:15:33 -0400 Date: Mon, 20 Jul 2015 09:15:28 +0200 From: Igor Mammedov Message-ID: <20150720091528.66836701@nial.brq.redhat.com> In-Reply-To: <1437137380-1064-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1437137380-1064-1-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [FIX PATCH] pc-dimm: Fail pc-dimm realization for invalid nodes in non-NUMA configuration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: imammedo@redhat.com, qemu-devel@nongnu.org, david@gibson.dropbear.id.au On Fri, 17 Jul 2015 18:19:40 +0530 Bharata B Rao wrote: > pc_dimm_realize() validates the NUMA node to which memory hotplug is > being performed only in case of NUMA configuration. Include a check > to fail invalid nodes in case of non-NUMA configuration too. > > Signed-off-by: Bharata B Rao Reviewed-by: Igor Mammedov > --- > hw/mem/pc-dimm.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index bb04862..099025e 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -414,10 +414,11 @@ static void pc_dimm_realize(DeviceState *dev, Error **errp) > error_setg(errp, "'" PC_DIMM_MEMDEV_PROP "' property is not set"); > return; > } > - if ((nb_numa_nodes > 0) && (dimm->node >= nb_numa_nodes)) { > + if (((nb_numa_nodes > 0) && (dimm->node >= nb_numa_nodes)) || > + (!nb_numa_nodes && dimm->node)) { > 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); > + dimm->node, nb_numa_nodes ? nb_numa_nodes : 1); > return; > } > }