diff options
| author | Paul Durrant <paul.durrant@citrix.com> | 2018-05-17 16:35:50 +0100 |
|---|---|---|
| committer | Stefano Stabellini <sstabellini@kernel.org> | 2018-05-22 11:43:21 -0700 |
| commit | 5c0d914a9ba9e0641554d127b62859ac0e954b9e (patch) | |
| tree | 1509a19728c911255971c0562f4c83371b1f8f3b /include/hw | |
| parent | 8d0f08e95b2d5f8ff6dea4027247bb0e8cc19cdf (diff) | |
| download | focaccia-qemu-5c0d914a9ba9e0641554d127b62859ac0e954b9e.tar.gz focaccia-qemu-5c0d914a9ba9e0641554d127b62859ac0e954b9e.zip | |
xen: add a meaningful declaration of grant_copy_segment into xen_common.h
Currently the xen_disk source has to carry #ifdef exclusions to compile against Xen older then 4.8. This is a bit messy so this patch lifts the definition of struct xengnttab_grant_copy_segment and adds it into the pre-4.8 compat area in xen_common.h, which allows xen_disk to be cleaned up. Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Acked-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/xen/xen_common.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 5f1402b494..bbf207dcef 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -667,8 +667,21 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref, #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40800 - -typedef void *xengnttab_grant_copy_segment_t; +struct xengnttab_grant_copy_segment { + union xengnttab_copy_ptr { + void *virt; + struct { + uint32_t ref; + uint16_t offset; + uint16_t domid; + } foreign; + } source, dest; + uint16_t len; + uint16_t flags; + int16_t status; +}; + +typedef struct xengnttab_grant_copy_segment xengnttab_grant_copy_segment_t; static inline int xengnttab_grant_copy(xengnttab_handle *xgt, uint32_t count, xengnttab_grant_copy_segment_t *segs) |