domctl: Fix cpumap/cpumask conversion functions to return an error code.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c
index c1af188bc3..8c049c1830 100644
--- a/xen/common/cpupool.c
+++ b/xen/common/cpupool.c
@@ -446,8 +446,7 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op)
         op->cpupool_id = c->cpupool_id;
         op->sched_id = c->sched.sched_id;
         op->n_dom = c->n_dom;
-        cpumask_to_xenctl_cpumap(&(op->cpumap), &(c->cpu_valid));
-        ret = 0;
+        ret = cpumask_to_xenctl_cpumap(&(op->cpumap), &(c->cpu_valid));
     }
     break;
 
@@ -546,15 +545,14 @@ addcpu_out:
 
     case XEN_SYSCTL_CPUPOOL_OP_FREEINFO:
     {
-        cpumask_to_xenctl_cpumap(&(op->cpumap),
-            &cpupool_free_cpus);
-        ret = 0;
+        ret = cpumask_to_xenctl_cpumap(
+            &op->cpumap, &cpupool_free_cpus);
     }
     break;
 
     default:
         ret = -ENOSYS;
-
+        break;
     }
 
     spin_unlock(&cpupool_ctl_lock);