mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-08 13:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging

Browse Source 
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:
Peter Maydell
2015-11-23 16:07:49 +00:00
parent 68c61282fe a3567ba1e6
commit 5522a841ca
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backends/hostmem.c
View File

@@ -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.