Re: [Qemu-devel] [FIX PATCH] pc-dimm: Fail pc-dimm realization for invalid nodes in non-NUMA configuration

[Igor Mammedov <imammedo@redhat.com>]

On Fri, 17 Jul 2015 18:19:40 +0530
Bharata B Rao <bharata@linux.vnet.ibm.com> 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 <bharata@linux.vnet.ibm.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  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;
>      }
>  }