OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

NUMA queue, 2015-10-06 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJWFCbGAAoJECgHk2+YTcWmBzMP/2/W7UF14KQsuCxz8bYrzkQ5
 AFR7hmlHB0286lkORb+SutG3kf+cUXzuGYjpLkfGWUQhkViHYv1GNSxLsKU4ZnsE
 XiScuq5A158a0avxlucq2RQiNwhGhjZ+NTgGppbI6x9SYbnSVrA9FdLeC11h+9ER
 dm/fsw8fU8L6m4D4BmkNdUJo1vXJbpiZ9BYGVHrkrSPf+DvM1pr8SpgOsrc5Zi6m
 M2dLcfcd0jDUo8B9tzW0BeeMEN2GhW9BwNEQT110yXoyosRljvckzqMZUY+wv3yn
 IFk8xdjma2PO2EO0KN4sDuOeXfc99ysBKhQgE81yK7E02sNFio2XVgfASZQYyHRy
 YKyBqlNRNgZIy2tj41NLjPs2H0svEAa4eYnxbqHhgvwe2erx65iBjPCSt3kTGm4P
 lIywoo2LJI64c/iMti5Dxf4Y5BXTHgwPXwe/2p3YZX0/UboBrQ9+yOaOBq1gx4ey
 g1fxv3Wjj9X13la0GvbecRrrerwoHjY4AEwYTUSD7Cqtx/NF9eeR1Jh/NuvD6CG7
 dwx/9WxM1clxD6AE2aYo+V+hiG7j0YVsfxgSq/+zD6ZATZfZN62iA0/u1Z7H+VYp
 jX5vy51xQHcNlh5w7cYpOsmvoZLSEgZqjntimZYaE3yXob6vN3NfN3Ncx2Hpr76y
 Rpu9o4YRXfW3I9oJNP0w
 =EPRT
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-10-08 11:28:17 +01:00
parent eed2df6785 32532f215c
commit fb6345f452
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/mem/pc-dimm.c
View File

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