From: zhanghailiang Date: Fri, 26 Sep 2014 09:16:12 +0000 (+0800) Subject: pc-dimm: Don't check dimm->node when there is non-NUMA config X-Git-Tag: v2.1.3~69 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45c46f20c62bd7be98f774f2740ec775654e2668;p=thirdparty%2Fqemu.git pc-dimm: Don't check dimm->node when there is non-NUMA config 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 (cherry picked from commit fc50ff0666315be5120c70ad00cd0b0097484b84) Signed-off-by: Michael Roth --- diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 5bfc5b74830..a800ea7a9fd 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);