[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v2 12/19] xen/sysctl: wrap around XEN_SYSCTL_cpupool_op
Function cpupool_do_sysctl is designed for doing cpupool related sysctl operations, and shall be wrapped. The following static functions are only called by cpupool_do_sysctl(), then shall be wrapped too: - cpupool_get_next_by_id - cpupool_destroy - cpupool_unassign_cpu_helper - cpupool_unassign_cpu Signed-off-by: Penny Zheng <Penny.Zheng@xxxxxxx> Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx> --- v1 -> v2: - no need to wrap declaration - add transient #ifdef in sysctl.c for correct compilation --- xen/common/sched/cpupool.c | 8 ++++++++ xen/common/sysctl.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 3d02c7b706..f5459c2779 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -241,10 +241,12 @@ struct cpupool *cpupool_get_by_id(unsigned int poolid) return __cpupool_get_by_id(poolid, true); } +#ifdef CONFIG_SYSCTL static struct cpupool *cpupool_get_next_by_id(unsigned int poolid) { return __cpupool_get_by_id(poolid, false); } +#endif /* CONFIG_SYSCTL */ void cpupool_put(struct cpupool *pool) { @@ -352,6 +354,7 @@ static struct cpupool *cpupool_create(unsigned int poolid, return ERR_PTR(ret); } +#ifdef CONFIG_SYSCTL /* * destroys the given cpupool * returns 0 on success, 1 else @@ -379,6 +382,7 @@ static int cpupool_destroy(struct cpupool *c) debugtrace_printk("cpupool_destroy(pool=%u)\n", c->cpupool_id); return 0; } +#endif /* CONFIG_SYSCTL */ /* * Move domain to another cpupool @@ -568,6 +572,7 @@ static int cpupool_unassign_cpu_start(struct cpupool *c, unsigned int cpu) return ret; } +#ifdef CONFIG_SYSCTL static long cf_check cpupool_unassign_cpu_helper(void *info) { struct cpupool *c = info; @@ -633,6 +638,7 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) } return continue_hypercall_on_cpu(work_cpu, cpupool_unassign_cpu_helper, c); } +#endif /* CONFIG_SYSCTL */ /* * add a new domain to a cpupool @@ -810,6 +816,7 @@ static void cpupool_cpu_remove_forced(unsigned int cpu) rcu_read_unlock(&sched_res_rculock); } +#ifdef CONFIG_SYSCTL /* * do cpupool related sysctl operations */ @@ -975,6 +982,7 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) return ret; } +#endif /* CONFIG_SYSCTL */ unsigned int cpupool_get_id(const struct domain *d) { diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 3129fc602d..0292233c7e 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -249,12 +249,12 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) copyback = 0; } break; -#endif /* CONFIG_SYSCTL */ case XEN_SYSCTL_cpupool_op: ret = cpupool_do_sysctl(&op->u.cpupool_op); break; +#endif /* CONFIG_SYSCTL */ case XEN_SYSCTL_scheduler_op: ret = sched_adjust_global(&op->u.scheduler_op); break; -- 2.34.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |