Re: [PATCH v2 13/26] xen/domctl: wrap sched_adjust() with CONFIG_MGMT_HYPERCALLS

[Jan Beulich <jbeulich@xxxxxxxx>]

On 10.09.2025 09:38, Penny Zheng wrote:
> --- a/xen/common/sched/arinc653.c
> +++ b/xen/common/sched/arinc653.c
> @@ -735,8 +735,8 @@ static const struct scheduler sched_arinc653_def = {
>  
>      .switch_sched   = a653_switch_sched,
>  
> -    .adjust         = NULL,

This line can just be dropped, can't it? It doesn't need ...

>  #ifdef CONFIG_MGMT_HYPERCALLS
> +    .adjust         = NULL,

... re-adding here.

> @@ -2288,7 +2290,9 @@ static const struct scheduler sched_credit_def = {
>      .wake           = csched_unit_wake,
>      .yield          = csched_unit_yield,
>  
> +#ifdef CONFIG_MGMT_HYPERCALLS
>      .adjust         = csched_dom_cntl,
> +#endif
>      .adjust_affinity= csched_aff_cntl,
>  #ifdef CONFIG_MGMT_HYPERCALLS
>      .adjust_global  = csched_sys_cntl,

Again better to get away with just a single #ifdef, I suppose.

> @@ -4246,7 +4248,9 @@ static const struct scheduler sched_credit2_def = {
>      .wake           = csched2_unit_wake,
>      .yield          = csched2_unit_yield,
>  
> +#ifdef CONFIG_MGMT_HYPERCALLS
>      .adjust         = csched2_dom_cntl,
> +#endif
>      .adjust_affinity= csched2_aff_cntl,
>  #ifdef CONFIG_MGMT_HYPERCALLS
>      .adjust_global  = csched2_sys_cntl,

Same here.

> --- a/xen/common/sched/private.h
> +++ b/xen/common/sched/private.h
> @@ -349,9 +349,11 @@ struct scheduler {
>      void         (*migrate)        (const struct scheduler *ops,
>                                      struct sched_unit *unit,
>                                      unsigned int new_cpu);
> +#ifdef CONFIG_MGMT_HYPERCALLS
>      int          (*adjust)         (const struct scheduler *ops,
>                                      struct domain *d,
>                                      struct xen_domctl_scheduler_op *op);
> +#endif
>      void         (*adjust_affinity)(const struct scheduler *ops,
>                                      struct sched_unit *unit,
>                                      const struct cpumask *hard,

And here, even if the other #ifdef is (just) out of context.

Jan