diff options
| author | zhanghailiang | 2014-09-26 11:16:12 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2014-09-29 18:44:04 +0200 |
| commit | fc50ff0666315be5120c70ad00cd0b0097484b84 (patch) | |
| tree | 31b3a364eab0b1551884275d8320c51299b5be54 | |
| parent | pci-hotplug-old: avoid losing error message (diff) | |
| download | qemu-fc50ff0666315be5120c70ad00cd0b0097484b84.tar.gz qemu-fc50ff0666315be5120c70ad00cd0b0097484b84.tar.xz qemu-fc50ff0666315be5120c70ad00cd0b0097484b84.zip | |
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 <imammedo@redhat.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/mem/pc-dimm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 5bfc5b7483..a800ea7a9f 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); |