Commit 6aa0205e authored by Ian Campbell's avatar Ian Campbell Committed by Stefano Stabellini
Browse files

xen: move xenforeignmemory compat layer into common place 



Now that we no longer support Xen 4.2 and earlier only the <470 case
needs this so it can live with all the others.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Reviewed-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent 81daba58

include/hw/xen/xen_common.h

+14 −20
Original line number Diff line number Diff line
@@ -53,7 +53,20 @@ typedef xc_gnttab xengnttab_handle; 
#define xengnttab_map_grant_refs(h, c, d, r, p) \

    xc_gnttab_map_grant_refs(h, c, d, r, p)



/* See below for xenforeignmemory_* APIs */

#define xenforeignmemory_open(l, f) xen_xc



static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom,

                                         int prot, size_t pages,

                                         const xen_pfn_t arr[/*pages*/],

                                         int err[/*pages*/])

{

    if (err)

        return xc_map_foreign_bulk(h, dom, prot, arr, err, pages);

    else

        return xc_map_foreign_pages(h, dom, prot, arr, pages);

}



#define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE)



#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 471 */
@@ -359,23 +372,4 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref, 
#endif

#endif



#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471



#define xenforeignmemory_open(l, f) xen_xc



static inline void *xenforeignmemory_map(xc_interface *h, uint32_t dom,

                                         int prot, size_t pages,

                                         const xen_pfn_t arr[/*pages*/],

                                         int err[/*pages*/])

{

    if (err)

        return xc_map_foreign_bulk(h, dom, prot, arr, err, pages);

    else

        return xc_map_foreign_pages(h, dom, prot, arr, pages);

}



#define xenforeignmemory_unmap(h, p, s) munmap(p, s * XC_PAGE_SIZE)



#endif



#endif /* QEMU_HW_XEN_COMMON_H */