From 832d88797a58af67ffd12277fe1d1faad4c5a49b Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Wed, 17 Sep 2014 15:59:17 -0700 Subject: [PATCH] TESTS: remove the read10_task helper Signed-off-by: Ronnie Sahlberg --- test-tool/iscsi-support.c | 36 +++----------------- test-tool/iscsi-support.h | 3 +- test-tool/test_mandatory_sbc.c | 2 +- test-tool/test_nomedia_sbc.c | 2 +- test-tool/test_orwrite_verify.c | 4 +-- test-tool/test_read10_0blocks.c | 8 ++--- test-tool/test_read10_beyond_eol.c | 8 ++--- test-tool/test_read10_flags.c | 10 +++--- test-tool/test_read10_rdprotect.c | 2 +- test-tool/test_read10_simple.c | 4 +-- test-tool/test_sanitize_block_erase.c | 7 ++-- test-tool/test_sanitize_crypto_erase.c | 7 ++-- test-tool/test_unmap_simple.c | 4 +-- test-tool/test_verify10_flags.c | 2 +- test-tool/test_verify10_mismatch.c | 4 +-- test-tool/test_verify10_mismatch_no_cmp.c | 4 +-- test-tool/test_verify10_simple.c | 4 +-- test-tool/test_verify10_vrprotect.c | 2 +- test-tool/test_verify12_simple.c | 2 +- test-tool/test_verify12_vrprotect.c | 2 +- test-tool/test_verify16_simple.c | 2 +- test-tool/test_write10_residuals.c | 4 +-- test-tool/test_writesame10_unmap.c | 6 ++-- test-tool/test_writesame10_unmap_until_end.c | 2 +- test-tool/test_writeverify10_residuals.c | 4 +-- 25 files changed, 55 insertions(+), 80 deletions(-) diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index ecafee2..d26bfe7 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -1497,37 +1497,9 @@ read6(struct iscsi_context *iscsi, int lun, uint32_t lba, return ret; } -struct scsi_task* -read10_task(struct iscsi_context *iscsi, int lun, uint32_t lba, - uint32_t datalen, int blocksize, int rdprotect, - int dpo, int fua, int fua_nv, int group, - unsigned char *data) -{ - struct scsi_task *task; - - logging(LOG_VERBOSE, "Send READ10 LBA:%d blocks:%d rdprotect:%d " - "dpo:%d fua:%d fua_nv:%d group:%d", - lba, datalen / blocksize, rdprotect, - dpo, fua, fua_nv, group); - - task = iscsi_read10_sync(iscsi, lun, lba, datalen, blocksize, - rdprotect, dpo, fua, fua_nv, group); - if (task == NULL) { - logging(LOG_NORMAL, "[FAILED] Failed to send READ10 command: %s", - iscsi_get_error(iscsi)); - return NULL; - } - - if (data != NULL) { - memcpy(data, task->datain.data, task->datain.size); - } - - logging(LOG_VERBOSE, "[OK] READ10 returned SUCCESS."); - return task; -} - int -read10(struct iscsi_context *iscsi, int lun, uint32_t lba, +read10(struct iscsi_context *iscsi, struct scsi_task **out_task, + int lun, uint32_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, @@ -1552,7 +1524,9 @@ read10(struct iscsi_context *iscsi, int lun, uint32_t lba, if (data) { memcpy(data, task->datain.data, task->datain.size); } - if (task) { + if (out_task) { + *out_task = task; + } else if (task) { scsi_free_scsi_task(task); } return ret; diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index 181d92a..5cca4af 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -260,8 +260,7 @@ int prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_block int prefetch16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num_blocks, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq); int preventallow(struct iscsi_context *iscsi, int lun, int prevent); int read6(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -struct scsi_task *read10_task(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data); -int read10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int read10(struct iscsi_context *iscsi, struct scsi_task **task, int lun, uint32_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); int read12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); int read16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); int readcapacity10(struct iscsi_context *iscsi, int lun, uint32_t lba, int pmi, int status, enum scsi_sense_key key, int *ascq, int num_ascq); diff --git a/test-tool/test_mandatory_sbc.c b/test-tool/test_mandatory_sbc.c index 77e4adb..e3b8238 100644 --- a/test-tool/test_mandatory_sbc.c +++ b/test-tool/test_mandatory_sbc.c @@ -53,7 +53,7 @@ test_mandatory_sbc(void) } logging(LOG_VERBOSE, "Test READ10."); - ret = read10(iscsic, tgt_lun, 0, block_size, block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_nomedia_sbc.c b/test-tool/test_nomedia_sbc.c index d2a5484..f17230c 100644 --- a/test-tool/test_nomedia_sbc.c +++ b/test-tool/test_nomedia_sbc.c @@ -73,7 +73,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test READ10 when medium is ejected."); - ret = read10(iscsic, tgt_lun, 0, block_size, block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_orwrite_verify.c b/test-tool/test_orwrite_verify.c index ad31849..b6f6245 100644 --- a/test-tool/test_orwrite_verify.c +++ b/test-tool/test_orwrite_verify.c @@ -65,7 +65,7 @@ test_orwrite_verify(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, readbuf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -82,7 +82,7 @@ test_orwrite_verify(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, readbuf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_read10_0blocks.c b/test-tool/test_read10_0blocks.c index b7dc994..973efba 100644 --- a/test-tool/test_read10_0blocks.c +++ b/test-tool/test_read10_0blocks.c @@ -30,7 +30,7 @@ test_read10_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ10 0-blocks at LBA==0"); - ret = read10(iscsic, tgt_lun, 0, 0, block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -41,21 +41,21 @@ test_read10_0blocks(void) } logging(LOG_VERBOSE, "Test READ10 0-blocks one block past end-of-LUN"); - ret = read10(iscsic, tgt_lun, num_blocks + 1, 0, + ret = read10(iscsic, NULL, tgt_lun, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ10 0-blocks at LBA==2^31"); - ret = read10(iscsic, tgt_lun, 0x80000000, 0, block_size, + ret = read10(iscsic, NULL, tgt_lun, 0x80000000, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ10 0-blocks at LBA==-1"); - ret = read10(iscsic, tgt_lun, -1, 0, block_size, + ret = read10(iscsic, NULL, tgt_lun, -1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_read10_beyond_eol.c b/test-tool/test_read10_beyond_eol.c index 621e14d..4fdae75 100644 --- a/test-tool/test_read10_beyond_eol.c +++ b/test-tool/test_read10_beyond_eol.c @@ -40,7 +40,7 @@ test_read10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, num_blocks + 1 - i, + ret = read10(iscsic, NULL,tgt_lun, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -52,7 +52,7 @@ test_read10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, 0x80000000, + ret = read10(iscsic, NULL, tgt_lun, 0x80000000, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -64,7 +64,7 @@ test_read10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, -1, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, -1, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -76,7 +76,7 @@ test_read10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, num_blocks - 1, + ret = read10(iscsic, NULL, tgt_lun, num_blocks - 1, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_read10_flags.c b/test-tool/test_read10_flags.c index 09b584b..b467278 100644 --- a/test-tool/test_read10_flags.c +++ b/test-tool/test_read10_flags.c @@ -36,35 +36,35 @@ test_read10_flags(void) CHECK_FOR_SBC; logging(LOG_VERBOSE, "Test READ10 with DPO==1"); - ret = read10(iscsic, tgt_lun, 0, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 1, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ10 with FUA==1 FUA_NV==0"); - ret = read10(iscsic, tgt_lun, 0, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 0, 1, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ10 with FUA==1 FUA_NV==1"); - ret = read10(iscsic, tgt_lun, 0, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 0, 1, 1, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ10 with FUA==0 FUA_NV==1"); - ret = read10(iscsic, tgt_lun, 0, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 0, 0, 1, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ10 with DPO==1 FUA==1 FUA_NV==1"); - ret = read10(iscsic, tgt_lun, 0, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 1, 1, 1, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_read10_rdprotect.c b/test-tool/test_read10_rdprotect.c index 0b0ebc0..c8fff2f 100644 --- a/test-tool/test_read10_rdprotect.c +++ b/test-tool/test_read10_rdprotect.c @@ -42,7 +42,7 @@ test_read10_rdprotect(void) if (!inq->protect || (rc16 != NULL && !rc16->prot_en)) { logging(LOG_VERBOSE, "Device does not support/use protection information. All commands should fail."); for (i = 1; i < 8; i++) { - ret = read10(iscsic, tgt_lun, 0, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, i, 0, 0, 0, 0, NULL, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_read10_simple.c b/test-tool/test_read10_simple.c index 68a10a7..b0d06c0 100644 --- a/test-tool/test_read10_simple.c +++ b/test-tool/test_read10_simple.c @@ -37,7 +37,7 @@ test_read10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL,tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -49,7 +49,7 @@ test_read10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, num_blocks - i, + ret = read10(iscsic, NULL, tgt_lun, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_sanitize_block_erase.c b/test-tool/test_sanitize_block_erase.c index fd15fe1..a32723c 100644 --- a/test-tool/test_sanitize_block_erase.c +++ b/test-tool/test_sanitize_block_erase.c @@ -30,11 +30,12 @@ static void check_wabereq(void) { - struct scsi_task *task_ret; + struct scsi_task *task_ret = NULL; logging(LOG_VERBOSE, "Read one block from LBA 0"); - task_ret = read10_task(iscsic, tgt_lun, 0, block_size, block_size, - 0, 0, 0, 0, 0, NULL); + read10(iscsic, &task_ret, tgt_lun, 0, block_size, block_size, + 0, 0, 0, 0, 0, NULL, + EXPECT_STATUS_GOOD); CU_ASSERT_PTR_NOT_NULL(task_ret); CU_ASSERT_NOT_EQUAL(task_ret->status, SCSI_STATUS_CANCELLED); diff --git a/test-tool/test_sanitize_crypto_erase.c b/test-tool/test_sanitize_crypto_erase.c index 7412189..9b0dd4b 100644 --- a/test-tool/test_sanitize_crypto_erase.c +++ b/test-tool/test_sanitize_crypto_erase.c @@ -30,11 +30,12 @@ static void check_wacereq(void) { - struct scsi_task *task_ret; + struct scsi_task *task_ret = NULL; logging(LOG_VERBOSE, "Read one block from LBA 0"); - task_ret = read10_task(iscsic, tgt_lun, 0, block_size, block_size, - 0, 0, 0, 0, 0, NULL); + read10(iscsic, &task_ret, tgt_lun, 0, block_size, block_size, + 0, 0, 0, 0, 0, NULL, + EXPECT_STATUS_GOOD); CU_ASSERT_PTR_NOT_NULL(task_ret); CU_ASSERT_NOT_EQUAL(task_ret->status, SCSI_STATUS_CANCELLED); diff --git a/test-tool/test_unmap_simple.c b/test-tool/test_unmap_simple.c index 711e3b0..a30400a 100644 --- a/test-tool/test_unmap_simple.c +++ b/test-tool/test_unmap_simple.c @@ -68,7 +68,7 @@ test_unmap_simple(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read blocks 0-%d", i); - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -102,7 +102,7 @@ test_unmap_simple(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read blocks 0-%d", i); - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify10_flags.c b/test-tool/test_verify10_flags.c index 7a6dd45..bcbe1d8 100644 --- a/test-tool/test_verify10_flags.c +++ b/test-tool/test_verify10_flags.c @@ -34,7 +34,7 @@ test_verify10_flags(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 flags"); - ret = read10(iscsic, tgt_lun, 0, block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify10_mismatch.c b/test-tool/test_verify10_mismatch.c index b50f757..cd2bca2 100644 --- a/test-tool/test_verify10_mismatch.c +++ b/test-tool/test_verify10_mismatch.c @@ -40,7 +40,7 @@ test_verify10_mismatch(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -66,7 +66,7 @@ test_verify10_mismatch(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, num_blocks - i, + ret = read10(iscsic, NULL, tgt_lun, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify10_mismatch_no_cmp.c b/test-tool/test_verify10_mismatch_no_cmp.c index dca8641..d3bbb25 100644 --- a/test-tool/test_verify10_mismatch_no_cmp.c +++ b/test-tool/test_verify10_mismatch_no_cmp.c @@ -40,7 +40,7 @@ test_verify10_mismatch_no_cmp(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -67,7 +67,7 @@ test_verify10_mismatch_no_cmp(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, num_blocks - i, + ret = read10(iscsic, NULL, tgt_lun, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify10_simple.c b/test-tool/test_verify10_simple.c index 631c376..7ce8826 100644 --- a/test-tool/test_verify10_simple.c +++ b/test-tool/test_verify10_simple.c @@ -38,7 +38,7 @@ test_verify10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -59,7 +59,7 @@ test_verify10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, num_blocks - i, + ret = read10(iscsic, NULL, tgt_lun, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify10_vrprotect.c b/test-tool/test_verify10_vrprotect.c index 1408d51..c1459b5 100644 --- a/test-tool/test_verify10_vrprotect.c +++ b/test-tool/test_verify10_vrprotect.c @@ -40,7 +40,7 @@ test_verify10_vrprotect(void) if (!inq->protect || (rc16 != NULL && !rc16->prot_en)) { logging(LOG_VERBOSE, "Device does not support/use protection information. All commands should fail."); for (i = 1; i < 8; i++) { - ret = read10(iscsic, tgt_lun, 0, block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify12_simple.c b/test-tool/test_verify12_simple.c index f806da4..10132c6 100644 --- a/test-tool/test_verify12_simple.c +++ b/test-tool/test_verify12_simple.c @@ -38,7 +38,7 @@ test_verify12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify12_vrprotect.c b/test-tool/test_verify12_vrprotect.c index 2badd62..b7130e4 100644 --- a/test-tool/test_verify12_vrprotect.c +++ b/test-tool/test_verify12_vrprotect.c @@ -41,7 +41,7 @@ test_verify12_vrprotect(void) logging(LOG_VERBOSE, "Device does not support/use protection information. All commands should fail."); for (i = 1; i < 8; i++) { - ret = read10(iscsic, tgt_lun, 0, block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); ret = verify12(iscsic, tgt_lun, 0, block_size, diff --git a/test-tool/test_verify16_simple.c b/test-tool/test_verify16_simple.c index 715086a..542fb5a 100644 --- a/test-tool/test_verify16_simple.c +++ b/test-tool/test_verify16_simple.c @@ -38,7 +38,7 @@ test_verify16_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(iscsic, tgt_lun, 0, i * block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); ret = verify16(iscsic, tgt_lun, 0, i * block_size, diff --git a/test-tool/test_write10_residuals.c b/test-tool/test_write10_residuals.c index 3fc6b42..9963a1a 100644 --- a/test-tool/test_write10_residuals.c +++ b/test-tool/test_write10_residuals.c @@ -289,7 +289,7 @@ test_write10_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read10(iscsic, tgt_lun, 0, 2* block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -365,7 +365,7 @@ test_write10_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read10(iscsic, tgt_lun, 0, 2* block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame10_unmap.c b/test-tool/test_writesame10_unmap.c index 42d62b1..ebb9369 100644 --- a/test-tool/test_writesame10_unmap.c +++ b/test-tool/test_writesame10_unmap.c @@ -62,7 +62,7 @@ test_writesame10_unmap(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read10(iscsic, tgt_lun, 0, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -101,7 +101,7 @@ test_writesame10_unmap(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read10(iscsic, tgt_lun, num_blocks - i, + ret = read10(iscsic, NULL, tgt_lun, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -177,7 +177,7 @@ test_writesame10_unmap(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read10(iscsic, tgt_lun, 0, + ret = read10(iscsic, NULL, tgt_lun, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); diff --git a/test-tool/test_writesame10_unmap_until_end.c b/test-tool/test_writesame10_unmap_until_end.c index 69cde77..2a4a805 100644 --- a/test-tool/test_writesame10_unmap_until_end.c +++ b/test-tool/test_writesame10_unmap_until_end.c @@ -64,7 +64,7 @@ test_writesame10_unmap_until_end(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read10(iscsic, tgt_lun, num_blocks - i, + ret = read10(iscsic, NULL, tgt_lun, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); diff --git a/test-tool/test_writeverify10_residuals.c b/test-tool/test_writeverify10_residuals.c index e4af7c1..0462105 100644 --- a/test-tool/test_writeverify10_residuals.c +++ b/test-tool/test_writeverify10_residuals.c @@ -294,7 +294,7 @@ test_writeverify10_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read10(iscsic, tgt_lun, 0, 2* block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -370,7 +370,7 @@ test_writeverify10_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read10(iscsic, tgt_lun, 0, 2* block_size, + ret = read10(iscsic, NULL, tgt_lun, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0);