diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-23 16:07:49 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-23 16:07:49 +0000 |
| commit | 5522a841cab5f15ac0f8d207b320c21755a7a1a5 (patch) | |
| tree | c658dfaabbd0432186ceb83eb79d988911c50d0a | |
| parent | 68c61282fe8a02aa3bddfa7a9c2b7ad7e6177f69 (diff) | |
| parent | a3567ba1e6171ef7cfad55ae549c0cd8bffb1195 (diff) | |
| download | qemu-5522a841cab5f15ac0f8d207b320c21755a7a1a5.zip qemu-5522a841cab5f15ac0f8d207b320c21755a7a1a5.tar.gz qemu-5522a841cab5f15ac0f8d207b320c21755a7a1a5.tar.bz2 | |
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>
| -rw-r--r-- | backends/hostmem.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/backends/hostmem.c b/backends/hostmem.c index 41ba2af..1b4eb45 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -313,9 +313,11 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) assert(maxnode <= MAX_NODES); if (mbind(ptr, sz, backend->policy, maxnode ? backend->host_nodes : NULL, maxnode + 1, flags)) { - error_setg_errno(errp, errno, - "cannot bind memory to host NUMA nodes"); - return; + if (backend->policy != MPOL_DEFAULT || errno != ENOSYS) { + error_setg_errno(errp, errno, + "cannot bind memory to host NUMA nodes"); + return; + } } #endif /* Preallocate memory after the NUMA policy has been instantiated. |