Skip to contentSkip to conversation

backends/hostmem: Ignore ENOSYS while setting MPOL_DEFAULT

PATCH In review Pavel Fedin 2 participants 2 messages Oct 27, 2015 Arm STM32

lore
Share & tools
lore

Pavel Fedin

author
#0 lore raw

PATCH 1/1 backends/hostmem: Ignore ENOSYS while setting MPOL_DEFAULT

Currently hostmem backend fails if CONFIG_NUMA is enabled for the qemu (default), but NUMA is not supported by the kernel. This makes it impossible to use ivshmem in such configurations.

This patch fixes the problem by ignoring ENOSYS error if policy is set to MPOL_DEFAULT. This way the code behaves in the same way as if CONFIG_NUMA was not defined. qemu will still fail if the user specifies some other policy, so that the user knows it.

Signed-off-by Pavel Fedin <[email protected]>
---
 backends/hostmem.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
backends/hostmem.c +4 -2
index 41ba2af..826141b 100644
@@ -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,
+            if ((backend->policy != MPOL_DEFAULT) || (errno != ENOSYS)) {
+                error_setg_errno(errp, errno,
                              "cannot bind memory to host NUMA nodes");
-            return;
+                return;
+            }
         }
 #endif
         /* Preallocate memory after the NUMA policy has been instantiated.
Signature · 1 line
1.9.5.msysgit.0
#1 lore raw
Quoted 1 line · Pavel Fedin

+ if ((backend->policy != MPOL_DEFAULT) || (errno != ENOSYS)) {

Can you remove parentheses around conditions?

Paolo

Quoted 4 lines
backends/hostmem.c +2 -1
+                error_setg_errno(errp, errno,
                              "cannot bind memory to host NUMA nodes");
-            return;
+                return;