admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TESTS: Add helper function for READ10 that returns a task*

Browse Source
This commit is contained in:
Ronnie Sahlberg
2013-07-05 16:14:21 -07:00
parent d8d10c0a44
commit 6a65874dd9
4 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test-tool/iscsi-support.c
View File

@@ -2074,6 +2074,35 @@ read6_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba,
return 0;
}
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,
uint32_t datalen, int blocksize, int rdprotect,

1
test-tool/iscsi-support.h
View File

@@ -243,6 +243,7 @@ int prefetch16_nomedium(struct iscsi_context *iscsi, int lun, uint64_t lba, int
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 read6_lbaoutofrange(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, unsigned char *data);
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 read10_invalidfieldincdb(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_lbaoutofrange(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);

11
test-tool/test_sanitize_block_erase.c
View File

@@ -33,15 +33,8 @@ check_wabereq(void)
struct scsi_task *task_ret;
logging(LOG_VERBOSE, "Read one block from LBA 0");
task_ret = malloc(sizeof(struct scsi_task));
CU_ASSERT_PTR_NOT_NULL(task_ret);
memset(task_ret, 0, sizeof(struct scsi_task));
task_ret->cdb[0] = SCSI_OPCODE_READ10;
task_ret->cdb[8] = 1;
task_ret->cdb_size = 10;
task_ret->xfer_dir = SCSI_XFER_READ;
task_ret->expxferlen = 0;
task_ret = iscsi_scsi_command_sync(iscsic, tgt_lun, task_ret, NULL);
task_ret = read10_task(iscsic, tgt_lun, 0, block_size, block_size,
0, 0, 0, 0, 0, NULL);
CU_ASSERT_PTR_NOT_NULL(task_ret);
CU_ASSERT_NOT_EQUAL(task_ret->status, SCSI_STATUS_CANCELLED);

11
test-tool/test_sanitize_crypto_erase.c
View File

@@ -32,15 +32,8 @@ check_wacereq(void)
struct scsi_task *task_ret;
logging(LOG_VERBOSE, "Read one block from LBA 0");
task_ret = malloc(sizeof(struct scsi_task));
CU_ASSERT_PTR_NOT_NULL(task_ret);
memset(task_ret, 0, sizeof(struct scsi_task));
task_ret->cdb[0] = SCSI_OPCODE_READ10;
task_ret->cdb[8] = 1;
task_ret->cdb_size = 10;
task_ret->xfer_dir = SCSI_XFER_READ;
task_ret->expxferlen = 0;
task_ret = iscsi_scsi_command_sync(iscsic, tgt_lun, task_ret, NULL);
task_ret = read10_task(iscsic, tgt_lun, 0, block_size, block_size,
0, 0, 0, 0, 0, NULL);
CU_ASSERT_PTR_NOT_NULL(task_ret);
CU_ASSERT_NOT_EQUAL(task_ret->status, SCSI_STATUS_CANCELLED);