Re: [PATCH 14/24] XSM/dummy: fold cf_check into XSM_INLINE

On 7/28/26 9:19 AM, Jan Beulich wrote:
> Use of cf_check together with always_inline is pretty pointless, and with
> XSM=n none of the dummy handlers are supposed to have their address taken.
> 
> Signed-off-by: Jan Beulich <[email protected]>
> 
> --- a/xen/include/xsm/dummy.h
> +++ b/xen/include/xsm/dummy.h
> @@ -54,7 +54,7 @@ void __xsm_action_mismatch_detected(void
>    * There is no xsm_default_t argument available, so the value from the assertion
>    * is used to initialize the variable.
>    */
> -#define XSM_INLINE __maybe_unused
> +#define XSM_INLINE __maybe_unused cf_check
>   
>   #define XSM_DEFAULT_ARG /* */
>   #define XSM_DEFAULT_VOID void
> @@ -104,7 +104,7 @@ static always_inline int xsm_default_act
>       }
>   }
>   
> -static XSM_INLINE int cf_check xsm_set_system_active(void)
> +static XSM_INLINE int xsm_set_system_active(void)
>   {
>       struct domain *d = current->domain;
>   
> @@ -121,34 +121,34 @@ static XSM_INLINE int cf_check xsm_set_s
>       return 0;
>   }
>   
> -static XSM_INLINE void cf_check xsm_security_domaininfo(
> +static XSM_INLINE void xsm_security_domaininfo(
>       struct domain *d, struct xen_domctl_getdomaininfo *info)
>   {
>       return;
>   }
>   
> -static XSM_INLINE int cf_check xsm_domain_create(
> +static XSM_INLINE int xsm_domain_create(
>       XSM_DEFAULT_ARG struct domain *d, uint32_t ssidref)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_getdomaininfo(
> +static XSM_INLINE int xsm_getdomaininfo(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_XS_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_set_target(
> +static XSM_INLINE int xsm_set_target(
>       XSM_DEFAULT_ARG struct domain *d, struct domain *e)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   
> -static XSM_INLINE int cf_check xsm_domctl(
> +static XSM_INLINE int xsm_domctl(
>       XSM_DEFAULT_ARG struct domain *d, struct xen_domctl *op)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
> @@ -174,61 +174,61 @@ static XSM_INLINE int cf_check xsm_domct
>       }
>   }
>   
> -static XSM_INLINE int cf_check xsm_sysctl(
> +static XSM_INLINE int xsm_sysctl(
>       XSM_DEFAULT_ARG const struct xen_sysctl *op)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   
> -static XSM_INLINE int cf_check xsm_alloc_security_domain(struct domain *d)
> +static XSM_INLINE int xsm_alloc_security_domain(struct domain *d)
>   {
>       return 0;
>   }
>   
> -static XSM_INLINE void cf_check xsm_free_security_domain(struct domain *d)
> +static XSM_INLINE void xsm_free_security_domain(struct domain *d)
>   {
>       return;
>   }
>   
>   #ifdef CONFIG_GRANT_TABLE
>   
> -static XSM_INLINE int cf_check xsm_grant_mapref(
> +static XSM_INLINE int xsm_grant_mapref(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2, uint32_t flags)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_grant_unmapref(
> +static XSM_INLINE int xsm_grant_unmapref(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_grant_setup(
> +static XSM_INLINE int xsm_grant_setup(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_grant_transfer(
> +static XSM_INLINE int xsm_grant_transfer(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_grant_copy(
> +static XSM_INLINE int xsm_grant_copy(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_grant_query_size(
> +static XSM_INLINE int xsm_grant_query_size(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
> @@ -237,28 +237,28 @@ static XSM_INLINE int cf_check xsm_grant
>   
>   #endif /* CONFIG_GRANT_TABLE */
>   
> -static XSM_INLINE int cf_check xsm_memory_exchange(
> +static XSM_INLINE int xsm_memory_exchange(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_memory_adjust_reservation(
> +static XSM_INLINE int xsm_memory_adjust_reservation(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_memory_stat_reservation(
> +static XSM_INLINE int xsm_memory_stat_reservation(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_console_io(
> +static XSM_INLINE int xsm_console_io(
>       XSM_DEFAULT_ARG struct domain *d, int cmd)
>   {
>       XSM_ASSERT_ACTION(XSM_OTHER);
> @@ -272,21 +272,21 @@ static XSM_INLINE int cf_check xsm_conso
>   }
>   
>   #ifdef CONFIG_KEXEC
> -static XSM_INLINE int cf_check xsm_kexec(XSM_DEFAULT_VOID)
> +static XSM_INLINE int xsm_kexec(XSM_DEFAULT_VOID)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   #endif
>   
> -static XSM_INLINE int cf_check xsm_schedop_shutdown(
> +static XSM_INLINE int xsm_schedop_shutdown(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_memory_pin_page(
> +static XSM_INLINE int xsm_memory_pin_page(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2,
>       struct page_info *page)
>   {
> @@ -294,20 +294,20 @@ static XSM_INLINE int cf_check xsm_memor
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_claim_pages(XSM_DEFAULT_ARG struct domain *d)
> +static XSM_INLINE int xsm_claim_pages(XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_evtchn_unbound(
> +static XSM_INLINE int xsm_evtchn_unbound(
>       XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn, domid_t id2)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_evtchn_interdomain(
> +static XSM_INLINE int xsm_evtchn_interdomain(
>       XSM_DEFAULT_ARG struct domain *d1, struct evtchn *chan1, struct domain *d2,
>       struct evtchn *chan2)
>   {
> @@ -315,72 +315,72 @@ static XSM_INLINE int cf_check xsm_evtch
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE void cf_check xsm_evtchn_close_post(struct evtchn *chn)
> +static XSM_INLINE void xsm_evtchn_close_post(struct evtchn *chn)
>   {
>       return;
>   }
>   
> -static XSM_INLINE int cf_check xsm_evtchn_send(
> +static XSM_INLINE int xsm_evtchn_send(
>       XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, d, NULL);
>   }
>   
> -static XSM_INLINE int cf_check xsm_evtchn_status(
> +static XSM_INLINE int xsm_evtchn_status(
>       XSM_DEFAULT_ARG struct domain *d, struct evtchn *chn)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_evtchn_reset(
> +static XSM_INLINE int xsm_evtchn_reset(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_alloc_security_evtchns(
> +static XSM_INLINE int xsm_alloc_security_evtchns(
>       struct evtchn chn[], unsigned int nr)
>   {
>       return 0;
>   }
>   
> -static XSM_INLINE void cf_check xsm_free_security_evtchns(
> +static XSM_INLINE void xsm_free_security_evtchns(
>       struct evtchn chn[], unsigned int nr)
>   {
>       return;
>   }
>   
> -static XSM_INLINE char *cf_check xsm_show_security_evtchn(
> +static XSM_INLINE char *xsm_show_security_evtchn(
>       struct domain *d, const struct evtchn *chn)
>   {
>       return NULL;
>   }
>   
> -static XSM_INLINE int cf_check xsm_init_hardware_domain(
> +static XSM_INLINE int xsm_init_hardware_domain(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_get_pod_target(
> +static XSM_INLINE int xsm_get_pod_target(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_set_pod_target(
> +static XSM_INLINE int xsm_set_pod_target(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_get_vnumainfo(
> +static XSM_INLINE int xsm_get_vnumainfo(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
> @@ -388,7 +388,7 @@ static XSM_INLINE int cf_check xsm_get_v
>   }
>   
>   #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI)
> -static XSM_INLINE int cf_check xsm_get_device_group(
> +static XSM_INLINE int xsm_get_device_group(
>       XSM_DEFAULT_ARG uint32_t machine_bdf)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
> @@ -398,14 +398,14 @@ static XSM_INLINE int cf_check xsm_get_d
>   
>   #if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI)
>   
> -static XSM_INLINE int cf_check xsm_resource_plug_pci(
> +static XSM_INLINE int xsm_resource_plug_pci(
>       XSM_DEFAULT_ARG uint32_t machine_bdf)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   
> -static XSM_INLINE int cf_check xsm_resource_unplug_pci(
> +static XSM_INLINE int xsm_resource_unplug_pci(
>       XSM_DEFAULT_ARG uint32_t machine_bdf)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
> @@ -416,14 +416,14 @@ static XSM_INLINE int cf_check xsm_resou
>   
>   #ifdef CONFIG_HAS_PCI
>   
> -static XSM_INLINE int cf_check xsm_resource_setup_pci(
> +static XSM_INLINE int xsm_resource_setup_pci(
>       XSM_DEFAULT_ARG uint32_t machine_bdf)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   
> -static XSM_INLINE int cf_check xsm_resource_setup_gsi(XSM_DEFAULT_ARG int gsi)
> +static XSM_INLINE int xsm_resource_setup_gsi(XSM_DEFAULT_ARG int gsi)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
> @@ -431,47 +431,47 @@ static XSM_INLINE int cf_check xsm_resou
>   
>   #endif /* CONFIG_HAS_PCI */
>   
> -static XSM_INLINE int cf_check xsm_resource_setup_misc(XSM_DEFAULT_VOID)
> +static XSM_INLINE int xsm_resource_setup_misc(XSM_DEFAULT_VOID)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   
>   #ifdef CONFIG_HYPFS
> -static XSM_INLINE int cf_check xsm_hypfs_op(XSM_DEFAULT_VOID)
> +static XSM_INLINE int xsm_hypfs_op(XSM_DEFAULT_VOID)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   #endif
>   
> -static XSM_INLINE long cf_check xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op)
> +static XSM_INLINE long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(void) op)
>   {
>       return -ENOSYS;
>   }
>   
>   #ifdef CONFIG_COMPAT
> -static XSM_INLINE int cf_check xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op)
> +static XSM_INLINE int xsm_do_compat_op(XEN_GUEST_HANDLE_PARAM(void) op)
>   {
>       return -ENOSYS;
>   }
>   #endif
>   
> -static XSM_INLINE char *cf_check xsm_show_irq_sid(int irq)
> +static XSM_INLINE char *xsm_show_irq_sid(int irq)
>   {
>       return NULL;
>   }
>   
>   #ifdef CONFIG_HAS_PIRQ
>   
> -static XSM_INLINE int cf_check xsm_map_domain_pirq(
> +static XSM_INLINE int xsm_map_domain_pirq(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_unmap_domain_pirq(
> +static XSM_INLINE int xsm_unmap_domain_pirq(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
> @@ -480,49 +480,49 @@ static XSM_INLINE int cf_check xsm_unmap
>   
>   #endif /* CONFIG_HAS_PIRQ */
>   
> -static XSM_INLINE int cf_check xsm_map_domain_irq(
> +static XSM_INLINE int xsm_map_domain_irq(
>       XSM_DEFAULT_ARG struct domain *d, int irq, const void *data)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_bind_pt_irq(
> +static XSM_INLINE int xsm_bind_pt_irq(
>       XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_unbind_pt_irq(
> +static XSM_INLINE int xsm_unbind_pt_irq(
>       XSM_DEFAULT_ARG struct domain *d, struct xen_domctl_bind_pt_irq *bind)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_unmap_domain_irq(
> +static XSM_INLINE int xsm_unmap_domain_irq(
>       XSM_DEFAULT_ARG struct domain *d, int irq, const void *data)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_irq_permission(
> +static XSM_INLINE int xsm_irq_permission(
>       XSM_DEFAULT_ARG struct domain *d, int pirq, uint8_t allow)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_iomem_permission(
> +static XSM_INLINE int xsm_iomem_permission(
>       XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_iomem_mapping(
> +static XSM_INLINE int xsm_iomem_mapping(
>       XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
> @@ -530,7 +530,7 @@ static XSM_INLINE int cf_check xsm_iomem
>   }
>   
>   #ifdef CONFIG_HAS_VPCI
> -static XSM_INLINE int cf_check xsm_iomem_mapping_vpci(
> +static XSM_INLINE int xsm_iomem_mapping_vpci(
>       XSM_DEFAULT_ARG struct domain *d, uint64_t s, uint64_t e, uint8_t allow)
>   {
>       XSM_ASSERT_ACTION(XSM_HOOK);
> @@ -539,7 +539,7 @@ static XSM_INLINE int cf_check xsm_iomem
>   #endif
>   
>   #ifdef CONFIG_HAS_PCI
> -static XSM_INLINE int cf_check xsm_pci_config_permission(
> +static XSM_INLINE int xsm_pci_config_permission(
>       XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf, uint16_t start,
>       uint16_t end, uint8_t access)
>   {
> @@ -548,21 +548,21 @@ static XSM_INLINE int cf_check xsm_pci_c
>   }
>   #endif /* CONFIG_HAS_PCI */
>   
> -static XSM_INLINE int cf_check xsm_add_to_physmap(
> +static XSM_INLINE int xsm_add_to_physmap(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_remove_from_physmap(
> +static XSM_INLINE int xsm_remove_from_physmap(
>       XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, d1, d2);
>   }
>   
> -static XSM_INLINE int cf_check xsm_map_gmfn_foreign(
> +static XSM_INLINE int xsm_map_gmfn_foreign(
>       XSM_DEFAULT_ARG struct domain *d, struct domain *t)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
> @@ -571,14 +571,14 @@ static XSM_INLINE int cf_check xsm_map_g
>   
>   #ifdef CONFIG_HVM
>   
> -static XSM_INLINE int cf_check xsm_hvm_param(
> +static XSM_INLINE int xsm_hvm_param(
>       XSM_DEFAULT_ARG struct domain *d, unsigned long op)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_hvm_param_altp2mhvm(
> +static XSM_INLINE int xsm_hvm_param_altp2mhvm(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
> @@ -588,7 +588,7 @@ static XSM_INLINE int cf_check xsm_hvm_p
>   #endif /* CONFIG_HVM */
>   
>   #ifdef CONFIG_ALTP2M
> -static XSM_INLINE int cf_check xsm_hvm_altp2mhvm_op(
> +static XSM_INLINE int xsm_hvm_altp2mhvm_op(
>       XSM_DEFAULT_ARG struct domain *d, uint64_t mode, uint32_t op)
>   {
>       XSM_ASSERT_ACTION(XSM_OTHER);
> @@ -610,7 +610,7 @@ static XSM_INLINE int cf_check xsm_hvm_a
>   #endif /* CONFIG_ALTP2M */
>   
>   #ifdef CONFIG_VM_EVENT
> -static XSM_INLINE int cf_check xsm_mem_access(XSM_DEFAULT_ARG struct domain *d)
> +static XSM_INLINE int xsm_mem_access(XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, d);
> @@ -618,7 +618,7 @@ static XSM_INLINE int cf_check xsm_mem_a
>   #endif
>   
>   #ifdef CONFIG_MEM_PAGING
> -static XSM_INLINE int cf_check xsm_mem_paging(XSM_DEFAULT_ARG struct domain *d)
> +static XSM_INLINE int xsm_mem_paging(XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, d);
> @@ -626,14 +626,14 @@ static XSM_INLINE int cf_check xsm_mem_p
>   #endif
>   
>   #ifdef CONFIG_MEM_SHARING
> -static XSM_INLINE int cf_check xsm_mem_sharing(XSM_DEFAULT_ARG struct domain *d)
> +static XSM_INLINE int xsm_mem_sharing(XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   #endif
>   
> -static XSM_INLINE int cf_check xsm_platform_op(XSM_DEFAULT_ARG uint32_t op)
> +static XSM_INLINE int xsm_platform_op(XSM_DEFAULT_ARG uint32_t op)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
> @@ -641,20 +641,20 @@ static XSM_INLINE int cf_check xsm_platf
>   
>   #ifdef CONFIG_X86
>   
> -static XSM_INLINE int cf_check xsm_mem_sharing_op(
> +static XSM_INLINE int xsm_mem_sharing_op(
>       XSM_DEFAULT_ARG struct domain *d, struct domain *cd, int op)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, cd);
>   }
>   
> -static XSM_INLINE int cf_check xsm_machine_memory_map(XSM_DEFAULT_VOID)
> +static XSM_INLINE int xsm_machine_memory_map(XSM_DEFAULT_VOID)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   
> -static XSM_INLINE int cf_check xsm_domain_memory_map(
> +static XSM_INLINE int xsm_domain_memory_map(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
> @@ -663,20 +663,20 @@ static XSM_INLINE int cf_check xsm_domai
>   
>   #ifdef CONFIG_PV
>   
> -static XSM_INLINE int cf_check xsm_apic(
> +static XSM_INLINE int xsm_apic(
>       XSM_DEFAULT_ARG struct domain *d, int cmd)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, d, NULL);
>   }
>   
> -static XSM_INLINE int cf_check xsm_do_mca(XSM_DEFAULT_VOID)
> +static XSM_INLINE int xsm_do_mca(XSM_DEFAULT_VOID)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, NULL);
>   }
>   
> -static XSM_INLINE int cf_check xsm_mmu_update(
> +static XSM_INLINE int xsm_mmu_update(
>       XSM_DEFAULT_ARG struct domain *d, struct domain *t, struct domain *f,
>       uint32_t flags)
>   {
> @@ -689,14 +689,14 @@ static XSM_INLINE int cf_check xsm_mmu_u
>       return rc;
>   }
>   
> -static XSM_INLINE int cf_check xsm_mmuext_op(
> +static XSM_INLINE int xsm_mmuext_op(
>       XSM_DEFAULT_ARG struct domain *d, struct domain *f)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
>       return xsm_default_action(action, d, f);
>   }
>   
> -static XSM_INLINE int cf_check xsm_update_va_mapping(
> +static XSM_INLINE int xsm_update_va_mapping(
>       XSM_DEFAULT_ARG struct domain *d, struct domain *f, l1_pgentry_t pte)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
> @@ -706,7 +706,7 @@ static XSM_INLINE int cf_check xsm_updat
>   #endif /* CONFIG_PV */
>   
>   #if defined(CONFIG_PV) || defined(CONFIG_SHADOW_PAGING)
> -static XSM_INLINE int cf_check xsm_priv_mapping(
> +static XSM_INLINE int xsm_priv_mapping(
>       XSM_DEFAULT_ARG struct domain *d, struct domain *t)
>   {
>       XSM_ASSERT_ACTION(XSM_TARGET);
> @@ -714,21 +714,21 @@ static XSM_INLINE int cf_check xsm_priv_
>   }
>   #endif
>   
> -static XSM_INLINE int cf_check xsm_ioport_permission(
> +static XSM_INLINE int xsm_ioport_permission(
>       XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow)
>   {
>       XSM_ASSERT_ACTION(XSM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_ioport_mapping(
> +static XSM_INLINE int xsm_ioport_mapping(
>       XSM_DEFAULT_ARG struct domain *d, uint32_t s, uint32_t e, uint8_t allow)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, d);
>   }
>   
> -static XSM_INLINE int cf_check xsm_pmu_op(
> +static XSM_INLINE int xsm_pmu_op(
>       XSM_DEFAULT_ARG struct domain *d, unsigned int op)
>   {
>       XSM_ASSERT_ACTION(XSM_OTHER);
> @@ -747,7 +747,7 @@ static XSM_INLINE int cf_check xsm_pmu_o
>   #endif /* CONFIG_X86 */
>   
>   #ifdef CONFIG_IOREQ_SERVER
> -static XSM_INLINE int cf_check xsm_dm_op(XSM_DEFAULT_ARG struct domain *d)
> +static XSM_INLINE int xsm_dm_op(XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
>       return xsm_default_action(action, current->domain, d);
> @@ -755,24 +755,24 @@ static XSM_INLINE int cf_check xsm_dm_op
>   #endif
>   
>   #ifdef CONFIG_ARGO
> -static XSM_INLINE int cf_check xsm_argo_enable(const struct domain *d)
> +static XSM_INLINE int xsm_argo_enable(const struct domain *d)
>   {
>       return 0;
>   }
>   
> -static XSM_INLINE int cf_check xsm_argo_register_single_source(
> +static XSM_INLINE int xsm_argo_register_single_source(
>       const struct domain *d, const struct domain *t)
>   {
>       return 0;
>   }
>   
> -static XSM_INLINE int cf_check xsm_argo_register_any_source(
> +static XSM_INLINE int xsm_argo_register_any_source(
>       const struct domain *d)
>   {
>       return 0;
>   }
>   
> -static XSM_INLINE int cf_check xsm_argo_send(
> +static XSM_INLINE int xsm_argo_send(
>       const struct domain *d, const struct domain *t)
>   {
>       return 0;
> @@ -780,7 +780,7 @@ static XSM_INLINE int cf_check xsm_argo_
>   
>   #endif /* CONFIG_ARGO */
>   
> -static XSM_INLINE int cf_check xsm_get_domain_state(
> +static XSM_INLINE int xsm_get_domain_state(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_XS_PRIV);
> @@ -788,7 +788,7 @@ static XSM_INLINE int cf_check xsm_get_d
>   }
>   
>   #include <public/version.h>
> -static XSM_INLINE int cf_check xsm_xen_version(XSM_DEFAULT_ARG uint32_t op)
> +static XSM_INLINE int xsm_xen_version(XSM_DEFAULT_ARG uint32_t op)
>   {
>       XSM_ASSERT_ACTION(XSM_OTHER);
>       switch ( op )
> @@ -815,7 +815,7 @@ static XSM_INLINE int cf_check xsm_xen_v
>       }
>   }
>   
> -static XSM_INLINE int cf_check xsm_domain_resource_map(
> +static XSM_INLINE int xsm_domain_resource_map(
>       XSM_DEFAULT_ARG struct domain *d)
>   {
>       XSM_ASSERT_ACTION(XSM_DM_PRIV);
> 

Acked-by: Daniel P. Smith <[email protected]>