Re: [Xen-devel] [PATCH 14/20] xen/gnttab: Remove replace_grant_supported()

[Julien Grall <julien.grall@xxxxxxx>]

Hi Andrew,

On 03/19/2018 07:13 PM, Andrew Cooper wrote:
> It is identical on all architecture, and this is a better overall than fixing
> it up to have a proper boolean return value.
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Reviewed-by: Julien Grall <julien.grall@xxxxxxx>

Cheers,

> ---
> CC: Jan Beulich <JBeulich@xxxxxxxx>
> CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> CC: Julien Grall <julien.grall@xxxxxxx>
> ---
>   xen/common/grant_table.c          | 3 ---
>   xen/include/asm-arm/grant_table.h | 4 ----
>   xen/include/asm-x86/grant_table.h | 5 -----
>   3 files changed, 12 deletions(-)
>
> diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
> index 1820191..93443be 100644
> --- a/xen/common/grant_table.c
> +++ b/xen/common/grant_table.c
> @@ -3459,9 +3459,6 @@ do_grant_table_op(
>   
>           if ( unlikely(!guest_handle_okay(unmap, count)) )
>               goto out;
> -        rc = -ENOSYS;
> -        if ( unlikely(!replace_grant_supported()) )
> -            goto out;
>           rc = gnttab_unmap_and_replace(unmap, count);
>           if ( rc > 0 )
>           {
> diff --git a/xen/include/asm-arm/grant_table.h 
> b/xen/include/asm-arm/grant_table.h
> index d2027d2..63a2fdd 100644
> --- a/xen/include/asm-arm/grant_table.h
> +++ b/xen/include/asm-arm/grant_table.h
> @@ -23,10 +23,6 @@ int replace_grant_host_mapping(unsigned long gpaddr, 
> unsigned long mfn,
>   void gnttab_mark_dirty(struct domain *d, unsigned long l);
>   #define gnttab_create_status_page(d, t, i) do {} while (0)
>   #define gnttab_release_host_mappings(domain) 1
> -static inline int replace_grant_supported(void)
> -{
> -    return 1;
> -}
>   
>   /*
>    * The region used by Xen on the memory will never be mapped in DOM0
> diff --git a/xen/include/asm-x86/grant_table.h 
> b/xen/include/asm-x86/grant_table.h
> index 4ac0b9b..514eaf3 100644
> --- a/xen/include/asm-x86/grant_table.h
> +++ b/xen/include/asm-x86/grant_table.h
> @@ -101,9 +101,4 @@ static inline void gnttab_clear_flag(unsigned int nr, 
> uint16_t *st)
>   #define gnttab_need_iommu_mapping(d)                \
>       (!paging_mode_translate(d) && need_iommu(d))
>   
> -static inline int replace_grant_supported(void)
> -{
> -    return 1;
> -}
> -
>   #endif /* __ASM_GRANT_TABLE_H__ */
--
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel