On 12.03.2025 05:06, Penny Zheng wrote:
> --- a/xen/include/xsm/dummy.h
> +++ b/xen/include/xsm/dummy.h
> @@ -180,11 +180,18 @@ static XSM_INLINE int cf_check xsm_domctl(
> }
> }
>
> +#ifdef CONFIG_SYSCTL
> static XSM_INLINE int cf_check xsm_sysctl(XSM_DEFAULT_ARG int cmd)
> {
> XSM_ASSERT_ACTION(XSM_PRIV);
> return xsm_default_action(action, current->domain, NULL);
> }
> +#else
> +static XSM_INLINE int cf_check xsm_sysctl(XSM_DEFAULT_ARG int cmd)
> +{
> + return -EOPNOTSUPP;
> +}
> +#endif
Please can you avoid introducing unnecessary redundancy, by putting the
#ifdef inside the function body here and ...
> @@ -259,10 +261,17 @@ static inline int xsm_domctl(xsm_default_t def, struct
> domain *d,
> return alternative_call(xsm_ops.domctl, d, cmd, ssidref);
> }
>
> +#ifdef CONFIG_SYSCTL
> static inline int xsm_sysctl(xsm_default_t def, int cmd)
> {
> return alternative_call(xsm_ops.sysctl, cmd);
> }
> +#else
> +static inline int xsm_sysctl(xsm_default_t def, int cmd)
> +{
> + return -EOPNOTSUPP;
> +}
> +#endif
... here? Provided these #ifdef-s are actually needed in the first place.
The earlier one I can't really see a need for. If there was a need, at
least the assertion likely also would want to stay outside of the #ifdef.
Jan
