Commit fb6345f4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging 



NUMA queue, 2015-10-06

# gpg: Signature made Tue 06 Oct 2015 20:53:42 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"

* remotes/ehabkost/tags/numa-pull-request:
  pc-dimm: Fail realization for invalid nodes in non-NUMA config

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents eed2df67 32532f21

hw/mem/pc-dimm.c

+3 −2
Original line number Diff line number Diff line
@@ -417,10 +417,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;

    }

}