From 219c252193862898430e5dea5efb7447877aaa85 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 17 Dec 2013 08:57:10 +0100 Subject: block/iscsi: Fix compilation for libiscsi 1.4.0 (API change) Function iscsi_read10_task got additional parameters starting with version libiscsi 1.5.0. libiscsi 1.4.0 is still widely used (Debian wheezy, jessie and other Linux distributions currently provide packages for QEMU which use it), so we still need support for this older API. Reviewed-by: Peter Lieven Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- block/iscsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'block/iscsi.c') diff --git a/block/iscsi.c b/block/iscsi.c index fa69408df9..294b2c6ab3 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -359,7 +359,10 @@ retry: default: iTask.task = iscsi_read10_task(iscsilun->iscsi, iscsilun->lun, lba, num_sectors * iscsilun->block_size, - iscsilun->block_size, 0, 0, 0, 0, 0, + iscsilun->block_size, +#if !defined(CONFIG_LIBISCSI_1_4) /* API change from 1.4.0 to 1.5.0 */ + 0, 0, 0, 0, 0, +#endif iscsi_co_generic_cb, &iTask); break; } -- cgit v1.2.3