[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] xen: move xenforeignmemory compat layer into com
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PULL 4/5] xen: move xenforeignmemory compat layer into common place |
Date: |
Fri, 12 Feb 2016 17:31:04 +0000 |
From: Ian Campbell <address@hidden>
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: Ian Campbell <address@hidden>
Reviewed-by: Stefano Stabellini <address@hidden>
Signed-off-by: Stefano Stabellini <address@hidden>
---
include/hw/xen/xen_common.h | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 254ef14..7a3cce0 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -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 */
--
1.7.10.4
- [Qemu-devel] [PULL 0/5] tags/xen-2016-02-12, Stefano Stabellini, 2016/02/12
- [Qemu-devel] [PULL 4/5] xen: move xenforeignmemory compat layer into common place,
Stefano Stabellini <=
- [Qemu-devel] [PULL 5/5] xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2, Stefano Stabellini, 2016/02/12
- [Qemu-devel] [PULL 2/5] xen: drop xen_xc_hvm_inject_msi wrapper, Stefano Stabellini, 2016/02/12
- [Qemu-devel] [PULL 3/5] xen: drop XenXC and associated interface wrappers, Stefano Stabellini, 2016/02/12
- [Qemu-devel] [PULL 1/5] xen: drop support for Xen 4.1 and older., Stefano Stabellini, 2016/02/12
- Re: [Qemu-devel] [PULL 0/5] tags/xen-2016-02-12, Peter Maydell, 2016/02/12