aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-12-17 08:57:10 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2013-12-20 09:11:58 +0100
commit219c252193862898430e5dea5efb7447877aaa85 (patch)
tree86f804f23d3c975b61a35df2b365a5ba14d5d618 /block
parentc27de2a3e9c8664116287d639bacd600e61a6b45 (diff)
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 <pl@kamp.de> Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/iscsi.c5
1 files changed, 4 insertions, 1 deletions
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;
}