summary refs log tree commit diff stats
path: root/hw/mem/pc-dimm.c
diff options
context:
space:
mode:
authorHu Tao <hutao@cn.fujitsu.com>2014-08-04 16:16:08 +0800
committerMichael S. Tsirkin <mst@redhat.com>2014-08-14 13:20:59 +0200
commitcfe0ffd0272f1a6d34d27ac1a7072d1c42d33ad3 (patch)
treee35f66cd666f7a96f07367a106a3f36d84843261 /hw/mem/pc-dimm.c
parent41d2f71376fe401a1fdb7deda023769207511790 (diff)
downloadfocaccia-qemu-cfe0ffd0272f1a6d34d27ac1a7072d1c42d33ad3.tar.gz
focaccia-qemu-cfe0ffd0272f1a6d34d27ac1a7072d1c42d33ad3.zip
pc-dimm: validate node property
If user specifies a node number that exceeds the available numa nodes in
emulated system for pc-dimm device, the device will report an invalid _PXM
to OSPM. Fix this by checking the node property value.

Cc: qemu-stable@nongnu.org
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/mem/pc-dimm.c')
-rw-r--r--hw/mem/pc-dimm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 08f49ed53b..92e276f2f4 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -252,6 +252,11 @@ 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) {
+        error_setg(errp, "'" PC_DIMM_NODE_PROP
+                   "' exceeds numa node number: %" PRId32, nb_numa_nodes);
+        return;
+    }
 }
 
 static MemoryRegion *pc_dimm_get_memory_region(PCDIMMDevice *dimm)