NUMA fix for -rc2
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJWUwpuAAoJECgHk2+YTcWmuPsP/jJGg3Z50bVjazW3yNJhIKzO AclvKbzvkV6BtvJcaPXsswa95GjH3zc0+C0IxtbHcvMtJWhMGMfyY+jhNOfy5+ma h0RkN3BJkQ/knnLfDzu5Rp0NSrS9Q/p79qSzJm6fkmNv34HykucUVkoKSRTdvsRq tIyTgza3iEdRT6v9yXRUNcxUDGXoJfYSYrKKPwPq8X/L4H/QWjaFTex9acFaBrJe PkUMHHP+++tOVKVX7WEidQxVj/7PtW3nIFX4RoxbdOfdHSslMTcuwQr406AWZy7X TQNI5ymMuKHsgOMJHSE9gG4TK0jOb4csmfKm4/wO+oTdWS6C5NtSSqFjkzF79b1h PlnTqsa6xh90jSFctei8098jhnQy90Bt4rP/dG/7NwgouzTWPxj+GQhKNMkf0OHt ssVnHCKiE9UfRLhicnxGO0XOWMWR2xVZr2w78b8carIdYyY81jXoHpB3IFt4/mk2 zN0ZretSvWALzVbS7DNB753+s1OiLxHevByhsycvUJSQXi71UecY6UEqg14vygZX x2pFmTjeyEh/6W4JnZSZUkGbpwXrcB35uAsIvOE8pPHjo0YHn4qiCRvT8SXMsuxM EPxa+KPWJEp+z4X1BS9hBgr6u0YCdQPOmtIyT7hj0XLcDvX6dlybwFiYG2L+WdGN JOuJEteYsdJn/o0phc2E =UACw -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging NUMA fix for -rc2 # gpg: Signature made Mon 23 Nov 2015 12:45:34 GMT using RSA key ID 984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" * remotes/ehabkost/tags/numa-pull-request: hostmem: Ignore ENOSYS while setting MPOL_DEFAULT Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
5522a841ca
|
@ -313,9 +313,11 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp)
|
||||||
assert(maxnode <= MAX_NODES);
|
assert(maxnode <= MAX_NODES);
|
||||||
if (mbind(ptr, sz, backend->policy,
|
if (mbind(ptr, sz, backend->policy,
|
||||||
maxnode ? backend->host_nodes : NULL, maxnode + 1, flags)) {
|
maxnode ? backend->host_nodes : NULL, maxnode + 1, flags)) {
|
||||||
error_setg_errno(errp, errno,
|
if (backend->policy != MPOL_DEFAULT || errno != ENOSYS) {
|
||||||
"cannot bind memory to host NUMA nodes");
|
error_setg_errno(errp, errno,
|
||||||
return;
|
"cannot bind memory to host NUMA nodes");
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
/* Preallocate memory after the NUMA policy has been instantiated.
|
/* Preallocate memory after the NUMA policy has been instantiated.
|
||||||
|
|
Loading…
Reference in New Issue