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 /hw/block/xen_disk.c | |
| parent | 8d0f08e95b2d5f8ff6dea4027247bb0e8cc19cdf (diff) | |
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 'hw/block/xen_disk.c')
| -rw-r--r-- | hw/block/xen_disk.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index f74fcd42d1..78bfb41e7f 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -496,8 +496,6 @@ static int ioreq_map(struct ioreq *ioreq) return 0; } -#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40800 - static void ioreq_free_copy_buffers(struct ioreq *ioreq) { int i; @@ -579,22 +577,6 @@ static int ioreq_grant_copy(struct ioreq *ioreq) return rc; } -#else -static void ioreq_free_copy_buffers(struct ioreq *ioreq) -{ - abort(); -} - -static int ioreq_init_copy_buffers(struct ioreq *ioreq) -{ - abort(); -} - -static int ioreq_grant_copy(struct ioreq *ioreq) -{ - abort(); -} -#endif static int ioreq_runio_qemu_aio(struct ioreq *ioreq); |