[Xen-changelog] [xen staging] xen/gnttab: Remove replace_grant_supported()

[patchbot@xxxxxxx]

commit 353d6c4903572971207067aca0c6f72cd8fc91cd
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Mar 16 19:16:45 2018 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Jul 23 11:11:02 2018 +0100

    xen/gnttab: Remove replace_grant_supported()
    
    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>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 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 d2610e320c..51a4a7d20e 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -3467,9 +3467,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 e52936c79f..9c2c815526 100644
--- a/xen/include/asm-arm/grant_table.h
+++ b/xen/include/asm-arm/grant_table.h
@@ -22,10 +22,6 @@ int replace_grant_host_mapping(unsigned long gpaddr, mfn_t 
mfn,
 void gnttab_mark_dirty(struct domain *d, mfn_t mfn);
 #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 e42030936b..76ec5dda2c 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__ */
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog