diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index 2cf4e05..1775647 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -104,7 +104,7 @@ static const char *scsi_status_str(int status) return "UNKNOWN"; } -static int check_result(const char *opcode, struct iscsi_context *iscsi, +static int check_result(const char *opcode, struct scsi_device *sdev, struct scsi_task *task, int status, enum scsi_sense_key key, int *ascq, int num_ascq) @@ -113,7 +113,7 @@ static int check_result(const char *opcode, struct iscsi_context *iscsi, if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send %s command: " - "%s", opcode, iscsi_get_error(iscsi)); + "%s", opcode, iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -125,7 +125,7 @@ static int check_result(const char *opcode, struct iscsi_context *iscsi, } if (status == SCSI_STATUS_GOOD && task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] %s command failed with " - "sense. %s", opcode, iscsi_get_error(iscsi)); + "sense. %s", opcode, iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (status != SCSI_STATUS_GOOD && task->status == SCSI_STATUS_GOOD) { @@ -158,7 +158,7 @@ static int check_result(const char *opcode, struct iscsi_context *iscsi, opcode, scsi_sense_key_str(key), key, scsi_sense_ascq_str(ascq[0]), ascq[0], - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } logging(LOG_VERBOSE, "[OK] %s returned %s %s(0x%02x) %s(0x%04x)", @@ -292,7 +292,7 @@ iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) } int -orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, +orwrite(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, @@ -319,9 +319,9 @@ orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("ORWRITE", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("ORWRITE", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -329,7 +329,7 @@ orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, } int -prin_task(struct iscsi_context *iscsi, int lun, int service_action, +prin_task(struct scsi_device *sdev, int service_action, int success_expected) { const int buf_sz = 16384; @@ -340,12 +340,12 @@ prin_task(struct iscsi_context *iscsi, int lun, int service_action, logging(LOG_VERBOSE, "Send PRIN/SA=0x%02x, expect %s", service_action, success_expected ? "success" : "failure"); - task = iscsi_persistent_reserve_in_sync(iscsi, lun, + task = iscsi_persistent_reserve_in_sync(sdev->iscsi_ctx, sdev->iscsi_lun, service_action, buf_sz); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PRIN command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -360,7 +360,7 @@ prin_task(struct iscsi_context *iscsi, int lun, int service_action, if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PRIN/SA=0x%x failed: %s", - service_action, iscsi_get_error(iscsi)); + service_action, iscsi_get_error(sdev->iscsi_ctx)); ret = -1; } } else { @@ -379,7 +379,7 @@ prin_task(struct iscsi_context *iscsi, int lun, int service_action, } int -prin_read_keys(struct iscsi_context *iscsi, int lun, struct scsi_task **tp, +prin_read_keys(struct scsi_device *sdev, struct scsi_task **tp, struct scsi_persistent_reserve_in_read_keys **rkp) { const int buf_sz = 16384; @@ -388,12 +388,12 @@ prin_read_keys(struct iscsi_context *iscsi, int lun, struct scsi_task **tp, logging(LOG_VERBOSE, "Send PRIN/READ_KEYS"); - *tp = iscsi_persistent_reserve_in_sync(iscsi, lun, + *tp = iscsi_persistent_reserve_in_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_READ_KEYS, buf_sz); if (*tp == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PRIN command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if ((*tp)->status == SCSI_STATUS_CHECK_CONDITION @@ -405,7 +405,7 @@ prin_read_keys(struct iscsi_context *iscsi, int lun, struct scsi_task **tp, if ((*tp)->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PRIN command: failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } @@ -413,7 +413,7 @@ prin_read_keys(struct iscsi_context *iscsi, int lun, struct scsi_task **tp, if (rk == NULL) { logging(LOG_NORMAL, "[FAIL] failed to unmarshall PRIN/READ_KEYS data. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (rkp != NULL) @@ -423,7 +423,7 @@ prin_read_keys(struct iscsi_context *iscsi, int lun, struct scsi_task **tp, } int -prout_register_and_ignore(struct iscsi_context *iscsi, int lun, +prout_register_and_ignore(struct scsi_device *sdev, unsigned long long sark) { struct scsi_persistent_reserve_out_basic poc; @@ -433,8 +433,8 @@ prout_register_and_ignore(struct iscsi_context *iscsi, int lun, /* register our reservation key with the target */ logging(LOG_VERBOSE, - "Send PROUT/REGISTER_AND_IGNORE to register init=%s", - iscsi->initiator_name); + "Send PROUT/REGISTER_AND_IGNORE to register init=%s", + sdev->iscsi_ctx->initiator_name); if (!data_loss) { printf("--dataloss flag is not set in. Skipping PROUT\n"); @@ -443,13 +443,13 @@ prout_register_and_ignore(struct iscsi_context *iscsi, int lun, memset(&poc, 0, sizeof (poc)); poc.service_action_reservation_key = sark; - task = iscsi_persistent_reserve_out_sync(iscsi, lun, + task = iscsi_persistent_reserve_out_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_REGISTER_AND_IGNORE_EXISTING_KEY, SCSI_PERSISTENT_RESERVE_SCOPE_LU, 0, &poc); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PROUT command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION && @@ -462,7 +462,7 @@ prout_register_and_ignore(struct iscsi_context *iscsi, int lun, if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PROUT command: failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; } @@ -472,7 +472,7 @@ prout_register_and_ignore(struct iscsi_context *iscsi, int lun, } int -prout_register_key(struct iscsi_context *iscsi, int lun, +prout_register_key(struct scsi_device *sdev, unsigned long long sark, unsigned long long rk) { struct scsi_persistent_reserve_out_basic poc; @@ -483,8 +483,8 @@ prout_register_key(struct iscsi_context *iscsi, int lun, /* register/unregister our reservation key with the target */ logging(LOG_VERBOSE, "Send PROUT/REGISTER to %s init=%s", - sark != 0 ? "register" : "unregister", - iscsi->initiator_name); + sark != 0 ? "register" : "unregister", + sdev->iscsi_ctx->initiator_name); if (!data_loss) { printf("--dataloss flag is not set in. Skipping PROUT\n"); @@ -494,13 +494,13 @@ prout_register_key(struct iscsi_context *iscsi, int lun, memset(&poc, 0, sizeof (poc)); poc.service_action_reservation_key = sark; poc.reservation_key = rk; - task = iscsi_persistent_reserve_out_sync(iscsi, lun, + task = iscsi_persistent_reserve_out_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_REGISTER, SCSI_PERSISTENT_RESERVE_SCOPE_LU, 0, &poc); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PROUT command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -513,7 +513,7 @@ prout_register_key(struct iscsi_context *iscsi, int lun, if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PROUT command: failed with sense: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; } @@ -523,7 +523,7 @@ prout_register_key(struct iscsi_context *iscsi, int lun, } int -prin_verify_key_presence(struct iscsi_context *iscsi, int lun, +prin_verify_key_presence(struct scsi_device *sdev, unsigned long long key, int present) { struct scsi_task *task; @@ -535,16 +535,16 @@ prin_verify_key_presence(struct iscsi_context *iscsi, int lun, logging(LOG_VERBOSE, - "Send PRIN/READ_KEYS to verify key %s init=%s... ", - present ? "present" : "absent", - iscsi->initiator_name); + "Send PRIN/READ_KEYS to verify key %s init=%s... ", + present ? "present" : "absent", + sdev->iscsi_ctx->initiator_name); - task = iscsi_persistent_reserve_in_sync(iscsi, lun, + task = iscsi_persistent_reserve_in_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_READ_KEYS, buf_sz); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PRIN command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -558,7 +558,7 @@ prin_verify_key_presence(struct iscsi_context *iscsi, int lun, if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PRIN command: failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto dun; } @@ -567,7 +567,7 @@ prin_verify_key_presence(struct iscsi_context *iscsi, int lun, if (rk == NULL) { logging(LOG_NORMAL, "[FAILED] failed to unmarshall PRIN/READ_KEYS data. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto dun; } @@ -594,7 +594,7 @@ prin_verify_key_presence(struct iscsi_context *iscsi, int lun, } int -prout_reregister_key_fails(struct iscsi_context *iscsi, int lun, +prout_reregister_key_fails(struct scsi_device *sdev, unsigned long long sark) { struct scsi_persistent_reserve_out_basic poc; @@ -603,8 +603,8 @@ prout_reregister_key_fails(struct iscsi_context *iscsi, int lun, logging(LOG_VERBOSE, - "Send PROUT/REGISTER to ensure reregister fails init=%s", - iscsi->initiator_name); + "Send PROUT/REGISTER to ensure reregister fails init=%s", + sdev->iscsi_ctx->initiator_name); if (!data_loss) { printf("--dataloss flag is not set in. Skipping PROUT\n"); @@ -613,13 +613,13 @@ prout_reregister_key_fails(struct iscsi_context *iscsi, int lun, memset(&poc, 0, sizeof (poc)); poc.service_action_reservation_key = sark; - task = iscsi_persistent_reserve_out_sync(iscsi, lun, + task = iscsi_persistent_reserve_out_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_REGISTER, SCSI_PERSISTENT_RESERVE_SCOPE_LU, 0, &poc); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PROUT command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -641,7 +641,7 @@ prout_reregister_key_fails(struct iscsi_context *iscsi, int lun, } int -prout_reserve(struct iscsi_context *iscsi, int lun, +prout_reserve(struct scsi_device *sdev, unsigned long long key, enum scsi_persistent_out_type pr_type) { struct scsi_persistent_reserve_out_basic poc; @@ -651,9 +651,9 @@ prout_reserve(struct iscsi_context *iscsi, int lun, /* reserve the target using specified reservation type */ logging(LOG_VERBOSE, - "Send PROUT/RESERVE to reserve, type=%d (%s) init=%s", - pr_type, scsi_pr_type_str(pr_type), - iscsi->initiator_name); + "Send PROUT/RESERVE to reserve, type=%d (%s) init=%s", + pr_type, scsi_pr_type_str(pr_type), + sdev->iscsi_ctx->initiator_name); if (!data_loss) { printf("--dataloss flag is not set in. Skipping PROUT\n"); @@ -662,14 +662,14 @@ prout_reserve(struct iscsi_context *iscsi, int lun, memset(&poc, 0, sizeof (poc)); poc.reservation_key = key; - task = iscsi_persistent_reserve_out_sync(iscsi, lun, + task = iscsi_persistent_reserve_out_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_RESERVE, SCSI_PERSISTENT_RESERVE_SCOPE_LU, pr_type, &poc); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PROUT command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -683,7 +683,7 @@ prout_reserve(struct iscsi_context *iscsi, int lun, if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PROUT command: failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; } @@ -692,7 +692,7 @@ prout_reserve(struct iscsi_context *iscsi, int lun, } int -prout_release(struct iscsi_context *iscsi, int lun, +prout_release(struct scsi_device *sdev, unsigned long long key, enum scsi_persistent_out_type pr_type) { struct scsi_persistent_reserve_out_basic poc; @@ -701,8 +701,8 @@ prout_release(struct iscsi_context *iscsi, int lun, logging(LOG_VERBOSE, - "Send PROUT/RELEASE to release reservation, type=%d init=%s", - pr_type, iscsi->initiator_name); + "Send PROUT/RELEASE to release reservation, type=%d init=%s", + pr_type, sdev->iscsi_ctx->initiator_name); if (!data_loss) { printf("--dataloss flag is not set in. Skipping PROUT\n"); @@ -711,14 +711,14 @@ prout_release(struct iscsi_context *iscsi, int lun, memset(&poc, 0, sizeof (poc)); poc.reservation_key = key; - task = iscsi_persistent_reserve_out_sync(iscsi, lun, + task = iscsi_persistent_reserve_out_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_RELEASE, SCSI_PERSISTENT_RESERVE_SCOPE_LU, pr_type, &poc); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PROUT command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -732,7 +732,7 @@ prout_release(struct iscsi_context *iscsi, int lun, if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PROUT command: failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; } @@ -741,7 +741,7 @@ prout_release(struct iscsi_context *iscsi, int lun, } int -prin_verify_reserved_as(struct iscsi_context *iscsi, int lun, +prin_verify_reserved_as(struct scsi_device *sdev, unsigned long long key, enum scsi_persistent_out_type pr_type) { struct scsi_task *task; @@ -751,15 +751,15 @@ prin_verify_reserved_as(struct iscsi_context *iscsi, int lun, logging(LOG_VERBOSE, - "Send PRIN/READ_RESERVATION to verify type=%d init=%s... ", - pr_type, iscsi->initiator_name); + "Send PRIN/READ_RESERVATION to verify type=%d init=%s... ", + pr_type, sdev->iscsi_ctx->initiator_name); - task = iscsi_persistent_reserve_in_sync(iscsi, lun, + task = iscsi_persistent_reserve_in_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_READ_RESERVATION, buf_sz); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PRIN command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -773,7 +773,7 @@ prin_verify_reserved_as(struct iscsi_context *iscsi, int lun, if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PRIN command: failed with sense: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto dun; } @@ -781,7 +781,7 @@ prin_verify_reserved_as(struct iscsi_context *iscsi, int lun, if (rr == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to unmarshall PRIN/READ_RESERVATION data. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto dun; } @@ -815,7 +815,7 @@ prin_verify_reserved_as(struct iscsi_context *iscsi, int lun, } int -prin_verify_not_reserved(struct iscsi_context *iscsi, int lun) +prin_verify_not_reserved(struct scsi_device *sdev) { struct scsi_task *task; const int buf_sz = 16384; @@ -824,15 +824,15 @@ prin_verify_not_reserved(struct iscsi_context *iscsi, int lun) logging(LOG_VERBOSE, - "Send PRIN/READ_RESERVATION to verify not reserved init=%s", - iscsi->initiator_name); + "Send PRIN/READ_RESERVATION to verify not reserved init=%s", + sdev->iscsi_ctx->initiator_name); - task = iscsi_persistent_reserve_in_sync(iscsi, lun, + task = iscsi_persistent_reserve_in_sync(sdev->iscsi_ctx, sdev->iscsi_lun, SCSI_PERSISTENT_RESERVE_READ_RESERVATION, buf_sz); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PRIN command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -846,7 +846,7 @@ prin_verify_not_reserved(struct iscsi_context *iscsi, int lun) if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PRIN command: failed with sense: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto dun; } @@ -854,7 +854,7 @@ prin_verify_not_reserved(struct iscsi_context *iscsi, int lun) if (rr == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to unmarshall PRIN/READ_RESERVATION data: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto dun; } @@ -872,7 +872,7 @@ prin_verify_not_reserved(struct iscsi_context *iscsi, int lun) } int -verify_read_works(struct iscsi_context *iscsi, int lun, unsigned char *buf) +verify_read_works(struct scsi_device *sdev, unsigned char *buf) { struct scsi_task *task; const uint32_t lba = 1; @@ -886,21 +886,21 @@ verify_read_works(struct iscsi_context *iscsi, int lun, unsigned char *buf) */ logging(LOG_VERBOSE, "Send READ10 to verify READ works init=%s", - iscsi->initiator_name); + sdev->iscsi_ctx->initiator_name); - task = iscsi_read10_sync(iscsi, lun, lba, datalen, blksize, + task = iscsi_read10_sync(sdev->iscsi_ctx, sdev->iscsi_lun, lba, datalen, blksize, 0, 0, 0, 0, 0); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send READ10 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] READ10 command: failed with sense: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto dun; } @@ -912,7 +912,7 @@ verify_read_works(struct iscsi_context *iscsi, int lun, unsigned char *buf) } int -verify_write_works(struct iscsi_context *iscsi, int lun, unsigned char *buf) +verify_write_works(struct scsi_device *sdev, unsigned char *buf) { struct scsi_task *task; const uint32_t lba = 1; @@ -926,20 +926,20 @@ verify_write_works(struct iscsi_context *iscsi, int lun, unsigned char *buf) */ logging(LOG_VERBOSE, "Send WRITE10 to verify WRITE works init=%s", - iscsi->initiator_name); + sdev->iscsi_ctx->initiator_name); - task = iscsi_write10_sync(iscsi, lun, lba, buf, datalen, blksize, + task = iscsi_write10_sync(sdev->iscsi_ctx, sdev->iscsi_lun, lba, buf, datalen, blksize, 0, 0, 0, 0, 0); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send WRITE10 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] WRITE10 command: failed with sense: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; } scsi_free_scsi_task(task); @@ -947,7 +947,7 @@ verify_write_works(struct iscsi_context *iscsi, int lun, unsigned char *buf) } int -verify_read_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf) +verify_read_fails(struct scsi_device *sdev, unsigned char *buf) { struct scsi_task *task; const uint32_t lba = 1; @@ -961,15 +961,15 @@ verify_read_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf) */ logging(LOG_VERBOSE, - "Send READ10 to verify READ does not work init=%s", - iscsi->initiator_name); + "Send READ10 to verify READ does not work init=%s", + sdev->iscsi_ctx->initiator_name); - task = iscsi_read10_sync(iscsi, lun, lba, datalen, blksize, + task = iscsi_read10_sync(sdev->iscsi_ctx, sdev->iscsi_lun, lba, datalen, blksize, 0, 0, 0, 0, 0); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send READ10 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } @@ -991,7 +991,7 @@ verify_read_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf) } int -verify_write_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf) +verify_write_fails(struct scsi_device *sdev, unsigned char *buf) { struct scsi_task *task; const uint32_t lba = 1; @@ -1005,15 +1005,15 @@ verify_write_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf) */ logging(LOG_VERBOSE, - "Send WRITE10 to verify WRITE does not work init=%s", - iscsi->initiator_name); + "Send WRITE10 to verify WRITE does not work init=%s", + sdev->iscsi_ctx->initiator_name); - task = iscsi_write10_sync(iscsi, lun, lba, buf, datalen, blksize, + task = iscsi_write10_sync(sdev->iscsi_ctx, sdev->iscsi_lun, lba, buf, datalen, blksize, 0, 0, 0, 0, 0); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send WRITE10 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } @@ -1034,7 +1034,7 @@ verify_write_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf) } int -synchronizecache10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num, int sync_nv, int immed, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +synchronizecache10(struct scsi_device *sdev, uint32_t lba, int num, int sync_nv, int immed, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1047,9 +1047,9 @@ synchronizecache10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num, task = scsi_cdb_synchronizecache10(lba, num_blocks, sync_nv, immed); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("SYNCHRONIZECACHE10", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("SYNCHRONIZECACHE10", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1057,7 +1057,7 @@ synchronizecache10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num, } int -synchronizecache16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num, int sync_nv, int immed, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +synchronizecache16(struct scsi_device *sdev, uint64_t lba, int num, int sync_nv, int immed, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1070,16 +1070,16 @@ synchronizecache16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num, task = scsi_cdb_synchronizecache16(lba, num_blocks, sync_nv, immed); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("SYNCHRONIZECACHE16", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("SYNCHRONIZECACHE16", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } return ret; } -int sanitize(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, int param_len, struct iscsi_data *data) +int sanitize(struct scsi_device *sdev, int immed, int ause, int sa, int param_len, struct iscsi_data *data) { struct scsi_task *task; @@ -1087,12 +1087,12 @@ int sanitize(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, "PARAM_LEN:%d", immed, ause, sa, param_len); - task = iscsi_sanitize_sync(iscsi, lun, immed, ause, sa, param_len, + task = iscsi_sanitize_sync(sdev->iscsi_ctx, sdev->iscsi_lun, immed, ause, sa, param_len, data); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send SANITIZE command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -1106,7 +1106,7 @@ int sanitize(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] SANITIZE command: failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); scsi_free_scsi_task(task); return -1; } @@ -1115,7 +1115,7 @@ int sanitize(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, return 0; } -int sanitize_invalidfieldincdb(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, int param_len, struct iscsi_data *data) +int sanitize_invalidfieldincdb(struct scsi_device *sdev, int immed, int ause, int sa, int param_len, struct iscsi_data *data) { struct scsi_task *task; @@ -1124,12 +1124,12 @@ int sanitize_invalidfieldincdb(struct iscsi_context *iscsi, int lun, int immed, "PARAM_LEN:%d", immed, ause, sa, param_len); - task = iscsi_sanitize_sync(iscsi, lun, immed, ause, sa, param_len, + task = iscsi_sanitize_sync(sdev->iscsi_ctx, sdev->iscsi_lun, immed, ause, sa, param_len, data); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send SANITIZE command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -1152,7 +1152,7 @@ int sanitize_invalidfieldincdb(struct iscsi_context *iscsi, int lun, int immed, logging(LOG_NORMAL, "[FAILED] SANITIZE failed with wrong " "sense. Should have failed with ILLEGAL_REQUEST/" "INVALID_FIELD_IN_CDB. Sense:%s\n", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); scsi_free_scsi_task(task); return -1; } @@ -1163,7 +1163,7 @@ int sanitize_invalidfieldincdb(struct iscsi_context *iscsi, int lun, int immed, return 0; } -int sanitize_conflict(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, int param_len, struct iscsi_data *data) +int sanitize_conflict(struct scsi_device *sdev, int immed, int ause, int sa, int param_len, struct iscsi_data *data) { struct scsi_task *task; @@ -1172,12 +1172,12 @@ int sanitize_conflict(struct iscsi_context *iscsi, int lun, int immed, int ause, "PARAM_LEN:%d", immed, ause, sa, param_len); - task = iscsi_sanitize_sync(iscsi, lun, immed, ause, sa, param_len, + task = iscsi_sanitize_sync(sdev->iscsi_ctx, sdev->iscsi_lun, immed, ause, sa, param_len, data); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send SANITIZE command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_GOOD) { @@ -1189,7 +1189,7 @@ int sanitize_conflict(struct iscsi_context *iscsi, int lun, int immed, int ause, if (task->status != SCSI_STATUS_RESERVATION_CONFLICT) { logging(LOG_NORMAL, "[FAILED] Expected RESERVATION CONFLICT. " - "Sense:%s", iscsi_get_error(iscsi)); + "Sense:%s", iscsi_get_error(sdev->iscsi_ctx)); return -1; } @@ -1198,7 +1198,7 @@ int sanitize_conflict(struct iscsi_context *iscsi, int lun, int immed, int ause, return 0; } -int sanitize_writeprotected(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, int param_len, struct iscsi_data *data) +int sanitize_writeprotected(struct scsi_device *sdev, int immed, int ause, int sa, int param_len, struct iscsi_data *data) { struct scsi_task *task; @@ -1207,12 +1207,12 @@ int sanitize_writeprotected(struct iscsi_context *iscsi, int lun, int immed, int "PARAM_LEN:%d", immed, ause, sa, param_len); - task = iscsi_sanitize_sync(iscsi, lun, immed, ause, sa, param_len, + task = iscsi_sanitize_sync(sdev->iscsi_ctx, sdev->iscsi_lun, immed, ause, sa, param_len, data); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send SANITIZE command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_GOOD) { @@ -1227,7 +1227,7 @@ int sanitize_writeprotected(struct iscsi_context *iscsi, int lun, int immed, int logging(LOG_NORMAL, "[FAILED] SANITIZE failed with wrong " "sense. Should have failed with DATA_PRTOTECTION/" "WRITE_PROTECTED. Sense:%s\n", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); scsi_free_scsi_task(task); return -1; } @@ -1237,7 +1237,7 @@ int sanitize_writeprotected(struct iscsi_context *iscsi, int lun, int immed, int return 0; } -int startstopunit(struct iscsi_context *iscsi, int lun, int immed, int pcm, int pc, int no_flush, int loej, int start, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +int startstopunit(struct scsi_device *sdev, int immed, int pcm, int pc, int no_flush, int loej, int start, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1250,9 +1250,9 @@ int startstopunit(struct iscsi_context *iscsi, int lun, int immed, int pcm, int task = scsi_cdb_startstopunit(immed, pcm, pc, no_flush, loej, start); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("STARTSTOPUNIT", iscsi, task, status, key, ascq, + ret = check_result("STARTSTOPUNIT", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); @@ -1261,7 +1261,7 @@ int startstopunit(struct iscsi_context *iscsi, int lun, int immed, int pcm, int } int -testunitready(struct iscsi_context *iscsi, int lun, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +testunitready(struct scsi_device *sdev, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1272,9 +1272,9 @@ testunitready(struct iscsi_context *iscsi, int lun, int status, enum scsi_sense_ task = scsi_cdb_testunitready(); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("TESTUNITREADY", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("TESTUNITREADY", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1282,26 +1282,26 @@ testunitready(struct iscsi_context *iscsi, int lun, int status, enum scsi_sense_ } int -testunitready_clear_ua(struct iscsi_context *iscsi, int lun) +testunitready_clear_ua(struct scsi_device *sdev) { struct scsi_task *task; int ret = -1; logging(LOG_VERBOSE, - "Send TESTUNITREADY (To Clear Possible UA) init=%s", - iscsi->initiator_name); + "Send TESTUNITREADY (To Clear Possible UA) init=%s", + sdev->iscsi_ctx->initiator_name); - task = iscsi_testunitready_sync(iscsi, lun); + task = iscsi_testunitready_sync(sdev->iscsi_ctx, sdev->iscsi_lun); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send TESTUNITREADY command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); goto out; } if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[INFO] TESTUNITREADY command: failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); goto out; } logging(LOG_VERBOSE, "[OK] TESTUNITREADY does not return unit " @@ -1317,12 +1317,12 @@ out: * Returns -1 if allocating a SCSI task failed or if a communication error * occurred and a SCSI status if a SCSI response has been received. */ -int mode_sense(struct iscsi_context *iscsi, int lun) +int mode_sense(struct scsi_device *sdev) { struct scsi_task *t; enum scsi_status ret = -1; - t = iscsi_modesense6_sync(iscsi, lun, 0, SCSI_MODESENSE_PC_CURRENT, + t = iscsi_modesense6_sync(sdev->iscsi_ctx, sdev->iscsi_lun, 0, SCSI_MODESENSE_PC_CURRENT, SCSI_MODEPAGE_RETURN_ALL_PAGES, 0, 255); if (t) { ret = t->status; @@ -1331,7 +1331,7 @@ int mode_sense(struct iscsi_context *iscsi, int lun) return ret; } -int compareandwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, +int compareandwrite(struct scsi_device *sdev, uint64_t lba, unsigned char *data, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int group_number, @@ -1357,16 +1357,16 @@ int compareandwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("COMPAREANDWRITE", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("COMPAREANDWRITE", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } return ret; } -int get_lba_status(struct iscsi_context *iscsi, struct scsi_task **out_task, int lun, uint64_t lba, uint32_t len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +int get_lba_status(struct scsi_device *sdev, struct scsi_task **out_task, uint64_t lba, uint32_t len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1379,9 +1379,9 @@ int get_lba_status(struct iscsi_context *iscsi, struct scsi_task **out_task, int task = scsi_cdb_get_lba_status(lba, len); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("GET_LBA_STATUS", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("GET_LBA_STATUS", sdev, task, status, key, ascq, num_ascq); if (out_task) { *out_task = task; } else if (task) { @@ -1391,7 +1391,7 @@ int get_lba_status(struct iscsi_context *iscsi, struct scsi_task **out_task, int } int -prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +prefetch10(struct scsi_device *sdev, uint32_t lba, int num, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1404,9 +1404,9 @@ prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num, int imme task = scsi_cdb_prefetch10(lba, num, immed, group); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("PREFETCH10", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("PREFETCH10", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1414,7 +1414,7 @@ prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num, int imme } int -prefetch16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +prefetch16(struct scsi_device *sdev, uint64_t lba, int num, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1427,9 +1427,9 @@ prefetch16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num, int imme task = scsi_cdb_prefetch16(lba, num, immed, group); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("PREFETCH16", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("PREFETCH16", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1437,15 +1437,15 @@ prefetch16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num, int imme } int -preventallow(struct iscsi_context *iscsi, int lun, int prevent) +preventallow(struct scsi_device *sdev, int prevent) { struct scsi_task *task; logging(LOG_VERBOSE, "Send PREVENTALLOW prevent:%d", prevent); - task = iscsi_preventallow_sync(iscsi, lun, prevent); + task = iscsi_preventallow_sync(sdev->iscsi_ctx, sdev->iscsi_lun, prevent); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send PREVENTALLOW " - "command: %s", iscsi_get_error(iscsi)); + "command: %s", iscsi_get_error(sdev->iscsi_ctx)); return -1; } if (task->status == SCSI_STATUS_CHECK_CONDITION @@ -1457,7 +1457,7 @@ preventallow(struct iscsi_context *iscsi, int lun, int prevent) } if (task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "[FAILED] PREVENTALLOW command: " - "failed with sense. %s", iscsi_get_error(iscsi)); + "failed with sense. %s", iscsi_get_error(sdev->iscsi_ctx)); scsi_free_scsi_task(task); return -1; } @@ -1468,7 +1468,7 @@ preventallow(struct iscsi_context *iscsi, int lun, int prevent) } int -read6(struct iscsi_context *iscsi, int lun, uint32_t lba, +read6(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) @@ -1483,9 +1483,9 @@ read6(struct iscsi_context *iscsi, int lun, uint32_t lba, task = scsi_cdb_read6(lba, datalen, blocksize); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("READ6", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("READ6", sdev, task, status, key, ascq, num_ascq); if (data) { memcpy(data, task->datain.data, task->datain.size); } @@ -1496,8 +1496,8 @@ read6(struct iscsi_context *iscsi, int lun, uint32_t lba, } int -read10(struct iscsi_context *iscsi, struct scsi_task **out_task, - int lun, uint32_t lba, +read10(struct scsi_device *sdev, struct scsi_task **out_task, + uint32_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, @@ -1516,9 +1516,9 @@ read10(struct iscsi_context *iscsi, struct scsi_task **out_task, dpo, fua, fua_nv, group); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("READ10", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("READ10", sdev, task, status, key, ascq, num_ascq); if (data) { memcpy(data, task->datain.data, task->datain.size); } @@ -1531,7 +1531,7 @@ read10(struct iscsi_context *iscsi, struct scsi_task **out_task, } int -read12(struct iscsi_context *iscsi, int lun, uint32_t lba, +read12(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, @@ -1550,9 +1550,9 @@ read12(struct iscsi_context *iscsi, int lun, uint32_t lba, dpo, fua, fua_nv, group); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("READ12", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("READ12", sdev, task, status, key, ascq, num_ascq); if (data) { memcpy(data, task->datain.data, task->datain.size); } @@ -1563,7 +1563,7 @@ read12(struct iscsi_context *iscsi, int lun, uint32_t lba, } int -read16(struct iscsi_context *iscsi, int lun, uint64_t lba, +read16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int rdprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, @@ -1582,9 +1582,9 @@ read16(struct iscsi_context *iscsi, int lun, uint64_t lba, dpo, fua, fua_nv, group); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("READ16", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("READ16", sdev, task, status, key, ascq, num_ascq); if (data) { memcpy(data, task->datain.data, task->datain.size); } @@ -1595,7 +1595,7 @@ read16(struct iscsi_context *iscsi, int lun, uint64_t lba, } 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) +readcapacity10(struct scsi_device *sdev, uint32_t lba, int pmi, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1608,9 +1608,9 @@ readcapacity10(struct iscsi_context *iscsi, int lun, uint32_t lba, int pmi, int task = scsi_cdb_readcapacity10(lba, pmi); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("READCAPACITY10", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("READCAPACITY10", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1618,7 +1618,7 @@ readcapacity10(struct iscsi_context *iscsi, int lun, uint32_t lba, int pmi, int } int -readcapacity16(struct iscsi_context *iscsi, int lun, int alloc_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +readcapacity16(struct scsi_device *sdev, int alloc_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1629,9 +1629,9 @@ readcapacity16(struct iscsi_context *iscsi, int lun, int alloc_len, int status, task = scsi_cdb_serviceactionin16(SCSI_READCAPACITY16, alloc_len); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("READCAPACITY16", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("READCAPACITY16", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1639,7 +1639,7 @@ readcapacity16(struct iscsi_context *iscsi, int lun, int alloc_len, int status, } int -release6(struct iscsi_context *iscsi, int lun) +release6(struct scsi_device *sdev) { struct scsi_task *task; int i, res = 0; @@ -1647,11 +1647,11 @@ release6(struct iscsi_context *iscsi, int lun) logging(LOG_VERBOSE, "Send RELEASE6"); for (i = 0; i < 3 && res == 0; ++i) { - task = iscsi_release6_sync(iscsi, lun); + task = iscsi_release6_sync(sdev->iscsi_ctx, sdev->iscsi_lun); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send RELEASE6 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); res = -1; break; } @@ -1661,7 +1661,7 @@ release6(struct iscsi_context *iscsi, int lun) && task->sense.ascq == SCSI_SENSE_ASCQ_BUS_RESET)) { logging(LOG_NORMAL, "[FAILED] RELEASE6 command: " "failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); res = -1; } scsi_free_scsi_task(task); @@ -1672,7 +1672,7 @@ release6(struct iscsi_context *iscsi, int lun) return res; } -int report_supported_opcodes(struct iscsi_context *iscsi, struct scsi_task **out_task, int lun, int rctd, int options, int opcode, int sa, int alloc_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +int report_supported_opcodes(struct scsi_device *sdev, struct scsi_task **out_task, int rctd, int options, int opcode, int sa, int alloc_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -1686,9 +1686,9 @@ int report_supported_opcodes(struct iscsi_context *iscsi, struct scsi_task **out alloc_len); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("INQUIRY", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("INQUIRY", sdev, task, status, key, ascq, num_ascq); if (out_task) { *out_task = task; } else if (task) { @@ -1698,7 +1698,7 @@ int report_supported_opcodes(struct iscsi_context *iscsi, struct scsi_task **out } int -reserve6(struct iscsi_context *iscsi, int lun) +reserve6(struct scsi_device *sdev) { struct scsi_task *task; int i, res = 0; @@ -1706,11 +1706,11 @@ reserve6(struct iscsi_context *iscsi, int lun) logging(LOG_VERBOSE, "Send RESERVE6"); for (i = 0; i < 3 && res == 0; ++i) { - task = iscsi_reserve6_sync(iscsi, lun); + task = iscsi_reserve6_sync(sdev->iscsi_ctx, sdev->iscsi_lun); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send RESERVE6 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); res = -1; break; } @@ -1726,7 +1726,7 @@ reserve6(struct iscsi_context *iscsi, int lun) && task->sense.ascq == SCSI_SENSE_ASCQ_BUS_RESET)) { logging(LOG_NORMAL, "[FAILED] RESERVE6 command: " "failed with sense. %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); res = -1; } scsi_free_scsi_task(task); @@ -1738,7 +1738,7 @@ reserve6(struct iscsi_context *iscsi, int lun) } int -reserve6_conflict(struct iscsi_context *iscsi, int lun) +reserve6_conflict(struct scsi_device *sdev) { struct scsi_task *task; int i, res = 0; @@ -1746,11 +1746,11 @@ reserve6_conflict(struct iscsi_context *iscsi, int lun) logging(LOG_VERBOSE, "Send RESERVE6 (Expecting RESERVATION_CONFLICT)"); for (i = 0; i < 3 && res == 0; ++i) { - task = iscsi_reserve6_sync(iscsi, lun); + task = iscsi_reserve6_sync(sdev->iscsi_ctx, sdev->iscsi_lun); if (task == NULL) { logging(LOG_NORMAL, "[FAILED] Failed to send RESERVE6 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); res = -1; break; } @@ -1778,7 +1778,7 @@ reserve6_conflict(struct iscsi_context *iscsi, int lun) } int -unmap(struct iscsi_context *iscsi, int lun, int anchor, struct unmap_list *list, int list_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +unmap(struct scsi_device *sdev, int anchor, struct unmap_list *list, int list_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; struct scsi_iovec *iov; @@ -1828,9 +1828,9 @@ unmap(struct iscsi_context *iscsi, int lun, int anchor, struct unmap_list *list, iov->iov_len = xferlen; scsi_task_set_iov_out(task, iov, 1); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("UNMAP", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("UNMAP", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1838,7 +1838,7 @@ unmap(struct iscsi_context *iscsi, int lun, int anchor, struct unmap_list *list, } int -verify10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +verify10(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; @@ -1855,9 +1855,9 @@ verify10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, i d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("VERIFY10", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("VERIFY10", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1865,7 +1865,7 @@ verify10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, i } int -verify12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +verify12(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; struct iscsi_data d; @@ -1881,9 +1881,9 @@ verify12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, i d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("VERIFY12", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("VERIFY12", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1891,7 +1891,7 @@ verify12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, i } int -verify16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +verify16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; struct iscsi_data d; @@ -1907,9 +1907,9 @@ verify16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, i d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("VERIFY16", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("VERIFY16", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1917,7 +1917,7 @@ verify16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, i } int -write10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +write10(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; struct iscsi_data d; @@ -1940,9 +1940,9 @@ write10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, in d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("WRITE10", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("WRITE10", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1950,7 +1950,7 @@ write10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, in } int -write12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +write12(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; struct iscsi_data d; @@ -1973,9 +1973,9 @@ write12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, in d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("WRITE12", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("WRITE12", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -1983,7 +1983,7 @@ write12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, in } int -write16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +write16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int fua, int fua_nv, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; struct iscsi_data d; @@ -2006,9 +2006,9 @@ write16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, in d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("WRITE16", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("WRITE16", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -2016,7 +2016,7 @@ write16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, in } int -writesame10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int num, int anchor, int unmap_flag, int wrprotect, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +writesame10(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int num, int anchor, int unmap_flag, int wrprotect, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; struct iscsi_data d; @@ -2045,9 +2045,9 @@ writesame10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("WRITESAME10", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("WRITESAME10", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -2055,7 +2055,7 @@ writesame10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen } int -writesame16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int num, int anchor, int unmap_flag, int wrprotect, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +writesame16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int num, int anchor, int unmap_flag, int wrprotect, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; struct iscsi_data d; @@ -2084,9 +2084,9 @@ writesame16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("WRITESAME16", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("WRITESAME16", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -2094,7 +2094,7 @@ writesame16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen } int -writeverify10(struct iscsi_context *iscsi, int lun, uint32_t lba, +writeverify10(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) @@ -2120,9 +2120,9 @@ writeverify10(struct iscsi_context *iscsi, int lun, uint32_t lba, d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("WRITEVERIFY10", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("WRITEVERIFY10", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -2130,7 +2130,7 @@ writeverify10(struct iscsi_context *iscsi, int lun, uint32_t lba, } int -writeverify12(struct iscsi_context *iscsi, int lun, uint32_t lba, +writeverify12(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) @@ -2156,9 +2156,9 @@ writeverify12(struct iscsi_context *iscsi, int lun, uint32_t lba, d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("WRITEVERIFY12", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("WRITEVERIFY12", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -2166,7 +2166,7 @@ writeverify12(struct iscsi_context *iscsi, int lun, uint32_t lba, } int -writeverify16(struct iscsi_context *iscsi, int lun, uint64_t lba, +writeverify16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq) @@ -2192,9 +2192,9 @@ writeverify16(struct iscsi_context *iscsi, int lun, uint64_t lba, d.data = data; d.size = datalen; - task = iscsi_scsi_command_sync(iscsi, lun, task, &d); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, &d); - ret = check_result("WRITEVERIFY16", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("WRITEVERIFY16", sdev, task, status, key, ascq, num_ascq); if (task) { scsi_free_scsi_task(task); } @@ -2202,7 +2202,7 @@ writeverify16(struct iscsi_context *iscsi, int lun, uint64_t lba, } int -inquiry(struct iscsi_context *iscsi, struct scsi_task **out_task, int lun, int evpd, int page_code, int maxsize, int status, enum scsi_sense_key key, int *ascq, int num_ascq) +inquiry(struct scsi_device *sdev, struct scsi_task **out_task, int evpd, int page_code, int maxsize, int status, enum scsi_sense_key key, int *ascq, int num_ascq) { struct scsi_task *task; int ret; @@ -2215,9 +2215,9 @@ inquiry(struct iscsi_context *iscsi, struct scsi_task **out_task, int lun, int e task = scsi_cdb_inquiry(evpd, page_code, maxsize); assert(task != NULL); - task = iscsi_scsi_command_sync(iscsi, lun, task, NULL); + task = iscsi_scsi_command_sync(sdev->iscsi_ctx, sdev->iscsi_lun, task, NULL); - ret = check_result("INQUIRY", iscsi, task, status, key, ascq, num_ascq); + ret = check_result("INQUIRY", sdev, task, status, key, ascq, num_ascq); if (out_task) { *out_task = task; } else if (task) { @@ -2245,7 +2245,7 @@ get_command_descriptor(int opcode, int sa) return NULL; } -int set_swp(struct iscsi_context *iscsi, int lun) +int set_swp(struct scsi_device *sdev) { int ret = 0; struct scsi_task *sense_task = NULL; @@ -2254,19 +2254,19 @@ int set_swp(struct iscsi_context *iscsi, int lun) struct scsi_mode_page *mp; logging(LOG_VERBOSE, "Read CONTROL page"); - sense_task = iscsi_modesense6_sync(iscsi, lun, + sense_task = iscsi_modesense6_sync(sdev->iscsi_ctx, sdev->iscsi_lun, 1, SCSI_MODESENSE_PC_CURRENT, SCSI_MODEPAGE_CONTROL, 0, 255); if (sense_task == NULL) { logging(LOG_NORMAL, "Failed to send MODE_SENSE6 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto finished; } if (sense_task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "MODE_SENSE6 failed: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto finished; } @@ -2287,17 +2287,17 @@ int set_swp(struct iscsi_context *iscsi, int lun) logging(LOG_VERBOSE, "Turn SWP ON"); mp->control.swp = 1; - select_task = iscsi_modeselect6_sync(iscsi, lun, + select_task = iscsi_modeselect6_sync(sdev->iscsi_ctx, sdev->iscsi_lun, 1, 0, mp); if (select_task == NULL) { logging(LOG_NORMAL, "Failed to send MODE_SELECT6 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto finished; } if (select_task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "MODE_SELECT6 failed: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto finished; } @@ -2312,7 +2312,7 @@ finished: return ret; } -int clear_swp(struct iscsi_context *iscsi, int lun) +int clear_swp(struct scsi_device *sdev) { int ret = 0; struct scsi_task *sense_task = NULL; @@ -2321,19 +2321,19 @@ int clear_swp(struct iscsi_context *iscsi, int lun) struct scsi_mode_page *mp; logging(LOG_VERBOSE, "Read CONTROL page"); - sense_task = iscsi_modesense6_sync(iscsi, lun, + sense_task = iscsi_modesense6_sync(sdev->iscsi_ctx, sdev->iscsi_lun, 1, SCSI_MODESENSE_PC_CURRENT, SCSI_MODEPAGE_CONTROL, 0, 255); if (sense_task == NULL) { logging(LOG_NORMAL, "Failed to send MODE_SENSE6 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto finished; } if (sense_task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "MODE_SENSE6 failed: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto finished; } @@ -2354,17 +2354,17 @@ int clear_swp(struct iscsi_context *iscsi, int lun) logging(LOG_VERBOSE, "Turn SWP OFF"); mp->control.swp = 0; - select_task = iscsi_modeselect6_sync(iscsi, lun, + select_task = iscsi_modeselect6_sync(sdev->iscsi_ctx, sdev->iscsi_lun, 1, 0, mp); if (select_task == NULL) { logging(LOG_NORMAL, "Failed to send MODE_SELECT6 command: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto finished; } if (select_task->status != SCSI_STATUS_GOOD) { logging(LOG_NORMAL, "MODE_SELECT6 failed: %s", - iscsi_get_error(iscsi)); + iscsi_get_error(sdev->iscsi_ctx)); ret = -1; goto finished; } diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index e390637..b79dc45 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -235,71 +235,71 @@ static inline int pr_type_is_all_registrants( } } -int prin_task(struct iscsi_context *iscsi, int lun, int service_action, +int prin_task(struct scsi_device *sdev, int service_action, int success_expected); -int prin_read_keys(struct iscsi_context *iscsi, int lun, struct scsi_task **tp, +int prin_read_keys(struct scsi_device *sdev, struct scsi_task **tp, struct scsi_persistent_reserve_in_read_keys **rkp); -int prout_register_and_ignore(struct iscsi_context *iscsi, int lun, +int prout_register_and_ignore(struct scsi_device *sdev, unsigned long long key); -int prout_register_key(struct iscsi_context *iscsi, int lun, +int prout_register_key(struct scsi_device *sdev, unsigned long long sark, unsigned long long rk); -int prin_verify_key_presence(struct iscsi_context *iscsi, int lun, +int prin_verify_key_presence(struct scsi_device *sdev, unsigned long long key, int present); -int prout_reregister_key_fails(struct iscsi_context *iscsi, int lun, +int prout_reregister_key_fails(struct scsi_device *sdev, unsigned long long sark); -int prout_reserve(struct iscsi_context *iscsi, int lun, +int prout_reserve(struct scsi_device *sdev, unsigned long long key, enum scsi_persistent_out_type pr_type); -int prout_release(struct iscsi_context *iscsi, int lun, +int prout_release(struct scsi_device *sdev, unsigned long long key, enum scsi_persistent_out_type pr_type); -int prin_verify_not_reserved(struct iscsi_context *iscsi, int lun); -int prin_verify_reserved_as(struct iscsi_context *iscsi, int lun, +int prin_verify_not_reserved(struct scsi_device *sdev); +int prin_verify_reserved_as(struct scsi_device *sdev, unsigned long long key, enum scsi_persistent_out_type pr_type); -int verify_read_works(struct iscsi_context *iscsi, int lun, unsigned char *buf); -int verify_write_works(struct iscsi_context *iscsi, int lun, unsigned char *buf); -int verify_read_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf); -int verify_write_fails(struct iscsi_context *iscsi, int lun, unsigned char *buf); -int inquiry(struct iscsi_context *iscsi, struct scsi_task **task, int lun, int evpd, int page_code, int maxsize, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int compareandwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, unsigned char *data, uint32_t len, int blocksize, int wrprotect, int dpo, int fua, int group_number, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int get_lba_status(struct iscsi_context *iscsi, struct scsi_task **task, int lun, uint64_t lba, uint32_t len, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int orwrite(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, 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 prefetch10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -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); -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); -int readcapacity16(struct iscsi_context *iscsi, int lun, int alloc_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int report_supported_opcodes(struct iscsi_context *iscsi, struct scsi_task **save_task, int lun, int rctd, int options, int opcode, int sa, int alloc_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int release6(struct iscsi_context *iscsi, int lun); -int reserve6(struct iscsi_context *iscsi, int lun); -int reserve6_conflict(struct iscsi_context *iscsi, int lun); -int sanitize(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, int param_len, struct iscsi_data *data); -int sanitize_conflict(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, int param_len, struct iscsi_data *data); -int sanitize_invalidfieldincdb(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, int param_len, struct iscsi_data *data); -int sanitize_writeprotected(struct iscsi_context *iscsi, int lun, int immed, int ause, int sa, int param_len, struct iscsi_data *data); -int startstopunit(struct iscsi_context *iscsi, int lun, int immed, int pcm, int pc, int no_flush, int loej, int start, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int synchronizecache10(struct iscsi_context *iscsi, int lun, uint32_t lba, int num_blocks, int sync_nv, int immed, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int synchronizecache16(struct iscsi_context *iscsi, int lun, uint64_t lba, int num_blocks, int sync_nv, int immed, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int testunitready_clear_ua(struct iscsi_context *iscsi, int lun); -int testunitready(struct iscsi_context *iscsi, int lun, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int mode_sense(struct iscsi_context *iscsi, int lun); -int unmap(struct iscsi_context *iscsi, int lun, int anchor, struct unmap_list *list, int list_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int verify10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int verify12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int verify16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int write10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, 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 write12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, 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 write16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, 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 writesame10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int num_blocks, int anchor, int unmap, int wrprotect, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int writesame16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int num_blocks, int anchor, int unmap, int wrprotect, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int writeverify10(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int writeverify12(struct iscsi_context *iscsi, int lun, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int writeverify16(struct iscsi_context *iscsi, int lun, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int verify_read_works(struct scsi_device *sdev, unsigned char *buf); +int verify_write_works(struct scsi_device *sdev, unsigned char *buf); +int verify_read_fails(struct scsi_device *sdev, unsigned char *buf); +int verify_write_fails(struct scsi_device *sdev, unsigned char *buf); +int inquiry(struct scsi_device *sdev, struct scsi_task **task, int evpd, int page_code, int maxsize, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int compareandwrite(struct scsi_device *sdev, uint64_t lba, unsigned char *data, uint32_t len, int blocksize, int wrprotect, int dpo, int fua, int group_number, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int get_lba_status(struct scsi_device *sdev, struct scsi_task **task, uint64_t lba, uint32_t len, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int orwrite(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, 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 prefetch10(struct scsi_device *sdev, uint32_t lba, int num_blocks, int immed, int group, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int prefetch16(struct scsi_device *sdev, 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 scsi_device *sdev, int prevent); +int read6(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int read10(struct scsi_device *sdev, struct scsi_task **task, 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 scsi_device *sdev, 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 scsi_device *sdev, 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 scsi_device *sdev, uint32_t lba, int pmi, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int readcapacity16(struct scsi_device *sdev, int alloc_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int report_supported_opcodes(struct scsi_device *sdev, struct scsi_task **save_task, int rctd, int options, int opcode, int sa, int alloc_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int release6(struct scsi_device *sdev); +int reserve6(struct scsi_device *sdev); +int reserve6_conflict(struct scsi_device *sdev); +int sanitize(struct scsi_device *sdev, int immed, int ause, int sa, int param_len, struct iscsi_data *data); +int sanitize_conflict(struct scsi_device *sdev, int immed, int ause, int sa, int param_len, struct iscsi_data *data); +int sanitize_invalidfieldincdb(struct scsi_device *sdev, int immed, int ause, int sa, int param_len, struct iscsi_data *data); +int sanitize_writeprotected(struct scsi_device *sdev, int immed, int ause, int sa, int param_len, struct iscsi_data *data); +int startstopunit(struct scsi_device *sdev, int immed, int pcm, int pc, int no_flush, int loej, int start, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int synchronizecache10(struct scsi_device *sdev, uint32_t lba, int num_blocks, int sync_nv, int immed, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int synchronizecache16(struct scsi_device *sdev, uint64_t lba, int num_blocks, int sync_nv, int immed, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int testunitready_clear_ua(struct scsi_device *sdev); +int testunitready(struct scsi_device *sdev, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int mode_sense(struct scsi_device *sdev); +int unmap(struct scsi_device *sdev, int anchor, struct unmap_list *list, int list_len, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int verify10(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int verify12(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int verify16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int vprotect, int dpo, int bytchk, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int write10(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, 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 write12(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, 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 write16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, 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 writesame10(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int num_blocks, int anchor, int unmap, int wrprotect, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int writesame16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int num_blocks, int anchor, int unmap, int wrprotect, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int writeverify10(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int writeverify12(struct scsi_device *sdev, uint32_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); +int writeverify16(struct scsi_device *sdev, uint64_t lba, uint32_t datalen, int blocksize, int wrprotect, int dpo, int bytchk, int group, unsigned char *data, int status, enum scsi_sense_key key, int *ascq, int num_ascq); -int set_swp(struct iscsi_context *iscsi, int lun); -int clear_swp(struct iscsi_context *iscsi, int lun); +int set_swp(struct scsi_device *sdev); +int clear_swp(struct scsi_device *sdev); #endif /* _ISCSI_SUPPORT_H_ */ diff --git a/test-tool/test_compareandwrite_miscompare.c b/test-tool/test_compareandwrite_miscompare.c index fa1f269..83ea2f5 100644 --- a/test-tool/test_compareandwrite_miscompare.c +++ b/test-tool/test_compareandwrite_miscompare.c @@ -53,7 +53,7 @@ test_compareandwrite_miscompare(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = write16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -72,7 +72,7 @@ test_compareandwrite_miscompare(void) "BlockLimits.MaximumCompareAndWriteLength(%d). " "Command should fail with INVALID_FIELD_IN_CDB", i, maxbl); - ret = compareandwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = compareandwrite(sd, 0, buf, 2 * i * block_size, block_size, 0, 0, 0, 0, EXPECT_INVALID_FIELD_IN_CDB); @@ -90,7 +90,7 @@ test_compareandwrite_miscompare(void) logging(LOG_VERBOSE, "Overwrite %d blocks with 'B' " "at LBA:0 (if they all contain 'A')", i); - ret = compareandwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = compareandwrite(sd, 0, buf, 2 * i * block_size, block_size, 0, 0, 0, 0, EXPECT_MISCOMPARE); @@ -103,7 +103,7 @@ test_compareandwrite_miscompare(void) logging(LOG_VERBOSE, "Read %d blocks at LBA:0 and verify " "they are still unchanged as 'A'", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -128,7 +128,7 @@ test_compareandwrite_miscompare(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = write16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -142,7 +142,7 @@ test_compareandwrite_miscompare(void) "BlockLimits.MaximumCompareAndWriteLength(%d). " "Command should fail with INVALID_FIELD_IN_CDB", i, maxbl); - ret = compareandwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = compareandwrite(sd, 0, buf, 2 * i * block_size, block_size, 0, 0, 0, 0, EXPECT_INVALID_FIELD_IN_CDB); @@ -155,7 +155,7 @@ test_compareandwrite_miscompare(void) logging(LOG_VERBOSE, "Overwrite %d blocks with 'B' " "at LBA:%" PRIu64 " (if they all contain 'A')", i, num_blocks - i); - ret = compareandwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = compareandwrite(sd, num_blocks - i, buf, 2 * i * block_size, block_size, 0, 0, 0, 0, EXPECT_MISCOMPARE); @@ -164,7 +164,7 @@ test_compareandwrite_miscompare(void) logging(LOG_VERBOSE, "Read %d blocks at LBA:%" PRIu64 "they are still unchanged as 'A'", i, num_blocks - i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = read16(sd, 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_compareandwrite_simple.c b/test-tool/test_compareandwrite_simple.c index cce245e..81b1fd0 100644 --- a/test-tool/test_compareandwrite_simple.c +++ b/test-tool/test_compareandwrite_simple.c @@ -54,7 +54,7 @@ test_compareandwrite_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = write16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -69,7 +69,7 @@ test_compareandwrite_simple(void) "BlockLimits.MaximumCompareAndWriteLength(%d). " "Command should fail with INVALID_FIELD_IN_CDB", i, maxbl); - ret = compareandwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = compareandwrite(sd, 0, buf, 2 * i * block_size, block_size, 0, 0, 0, 0, EXPECT_INVALID_FIELD_IN_CDB); @@ -87,7 +87,7 @@ test_compareandwrite_simple(void) logging(LOG_VERBOSE, "Overwrite %d blocks with 'B' " "at LBA:0 (if they all contain 'A')", i); - ret = compareandwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = compareandwrite(sd, 0, buf, 2 * i * block_size, block_size, 0, 0, 0, 0, EXPECT_STATUS_GOOD); @@ -100,7 +100,7 @@ test_compareandwrite_simple(void) logging(LOG_VERBOSE, "Read %d blocks at LBA:0 and verify " "they are all 'B'", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -126,7 +126,7 @@ test_compareandwrite_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = write16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -136,7 +136,7 @@ test_compareandwrite_simple(void) "BlockLimits.MaximumCompareAndWriteLength(%d). " "Command should fail with INVALID_FIELD_IN_CDB", i, maxbl); - ret = compareandwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = compareandwrite(sd, 0, buf, 2 * i * block_size, block_size, 0, 0, 0, 0, EXPECT_INVALID_FIELD_IN_CDB); @@ -149,7 +149,7 @@ test_compareandwrite_simple(void) logging(LOG_VERBOSE, "Overwrite %d blocks with 'B' " "at LBA:%" PRIu64 " (if they all contain 'A')", i, num_blocks - i); - ret = compareandwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = compareandwrite(sd, num_blocks - i, buf, 2 * i * block_size, block_size, 0, 0, 0, 0, EXPECT_STATUS_GOOD); @@ -158,7 +158,7 @@ test_compareandwrite_simple(void) logging(LOG_VERBOSE, "Read %d blocks at LBA:%" PRIu64 " and verify they are all 'B'", i, num_blocks - i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = read16(sd, 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_get_lba_status_beyond_eol.c b/test-tool/test_get_lba_status_beyond_eol.c index 1ae55a2..100e899 100644 --- a/test-tool/test_get_lba_status_beyond_eol.c +++ b/test-tool/test_get_lba_status_beyond_eol.c @@ -33,7 +33,7 @@ test_get_lba_status_beyond_eol(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test GET_LBA_STATUS one block beyond the end of the LUN"); - ret = get_lba_status(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks + 1, 24, + ret = get_lba_status(sd, NULL, num_blocks + 1, 24, EXPECT_LBA_OOB); if (ret == -2) { CU_PASS("[SKIPPED] Target does not support GET_LBA_STATUS. Skipping test"); @@ -43,13 +43,13 @@ test_get_lba_status_beyond_eol(void) logging(LOG_VERBOSE, "Test GET_LBA_STATUS at LBA 2^63"); - ret = get_lba_status(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0x8000000000000000ULL, 24, + ret = get_lba_status(sd, NULL, 0x8000000000000000ULL, 24, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test GET_LBA_STATUS at LBA -1"); - ret = get_lba_status(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0xffffffffffffffffULL, 24, + ret = get_lba_status(sd, NULL, 0xffffffffffffffffULL, 24, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_get_lba_status_simple.c b/test-tool/test_get_lba_status_simple.c index ba28bf6..03258e9 100644 --- a/test-tool/test_get_lba_status_simple.c +++ b/test-tool/test_get_lba_status_simple.c @@ -33,7 +33,7 @@ test_get_lba_status_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test GET_LBA_STATUS of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { - ret = get_lba_status(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 24, + ret = get_lba_status(sd, NULL,0, 24, EXPECT_STATUS_GOOD); if (ret == -2) { CU_PASS("[SKIPPED] Target does not support GET_LBA_STATUS. Skipping test"); @@ -48,7 +48,7 @@ test_get_lba_status_simple(void) logging(LOG_VERBOSE, "Test GET_LBA_STATUS of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { - ret = get_lba_status(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks - i, 24, + ret = get_lba_status(sd, NULL, num_blocks - i, 24, EXPECT_STATUS_GOOD); if (ret != 0) { CU_FAIL("[FAILED] GET_LBA_STATUS command failed"); diff --git a/test-tool/test_get_lba_status_unmap_single.c b/test-tool/test_get_lba_status_unmap_single.c index ea058dc..e174c02 100644 --- a/test-tool/test_get_lba_status_unmap_single.c +++ b/test-tool/test_get_lba_status_unmap_single.c @@ -50,7 +50,7 @@ test_get_lba_status_unmap_single(void) logging(LOG_VERBOSE, "Write the first %i blocks with a known " "pattern and thus map the blocks", 256 + lbppb); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, (256 + lbppb) * block_size, + ret = write10(sd, 0, (256 + lbppb) * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -60,13 +60,13 @@ test_get_lba_status_unmap_single(void) PRIu64 " (number of logical blocks: %d)", i, lbppb); list[0].lba = i; list[0].num = lbppb; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read the status of the block at LBA:%" PRIu64, i); - ret = get_lba_status(sd->iscsi_ctx, NULL, sd->iscsi_lun, i, 24, + ret = get_lba_status(sd, NULL, i, 24, EXPECT_STATUS_GOOD); if (ret == -2) { CU_PASS("[SKIPPED] Target does not support GET_LBA_STATUS. Skipping test"); @@ -78,7 +78,7 @@ test_get_lba_status_unmap_single(void) } logging(LOG_VERBOSE, "Read the status of the block at LBA:%" PRIu64, i + lbppb); - ret = get_lba_status(sd->iscsi_ctx, &t, sd->iscsi_lun, i + lbppb, 24, + ret = get_lba_status(sd, &t, i + lbppb, 24, EXPECT_STATUS_GOOD); if (ret != 0) { CU_FAIL("[FAILED] GET_LBA_STATUS command failed"); @@ -116,20 +116,20 @@ test_get_lba_status_unmap_single(void) for (i = lbppb; i + lbppb <= 256; i += lbppb) { logging(LOG_VERBOSE, "Write the first %i blocks with a known " "pattern and thus map the blocks", (256 + lbppb)); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, (256 + lbppb) * block_size, + ret = write10(sd, 0, (256 + lbppb) * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Unmap %" PRIu64 " blocks at LBA 0", i); list[0].lba = 0; list[0].num = i; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read the status of the block at LBA:0"); - ret = get_lba_status(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 24, + ret = get_lba_status(sd, NULL, 0, 24, EXPECT_STATUS_GOOD); if (ret == -2) { CU_PASS("[SKIPPED] Target does not support GET_LBA_STATUS. Skipping test"); @@ -140,7 +140,7 @@ test_get_lba_status_unmap_single(void) return; } logging(LOG_VERBOSE, "Read the status of the block at LBA:%" PRIu64, i + 1); - ret = get_lba_status(sd->iscsi_ctx, &t, sd->iscsi_lun, i + 1, 24, + ret = get_lba_status(sd, &t, i + 1, 24, EXPECT_STATUS_GOOD); if (ret != 0) { CU_FAIL("[FAILED] GET_LBA_STATUS command failed"); diff --git a/test-tool/test_inquiry_alloc_length.c b/test-tool/test_inquiry_alloc_length.c index 8e11589..1634479 100644 --- a/test-tool/test_inquiry_alloc_length.c +++ b/test-tool/test_inquiry_alloc_length.c @@ -40,7 +40,7 @@ test_inquiry_alloc_length(void) scsi_free_scsi_task(task); task = NULL; } - ret = inquiry(sd->iscsi_ctx, &task, sd->iscsi_lun, 0, 0, i, + ret = inquiry(sd, &task, 0, 0, i, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } @@ -83,12 +83,12 @@ test_inquiry_alloc_length(void) logging(LOG_VERBOSE, "Version is SPC-3 or later. Read INQUIRY data using 16-bit allocation length"); logging(LOG_VERBOSE, "Read INQUIRY data with allocation length 511 (low order byte is 0xff)"); - ret = inquiry(sd->iscsi_ctx, &task, sd->iscsi_lun, 0, 0, 511, + ret = inquiry(sd, &task, 0, 0, 511, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read INQUIRY data with allocation length 512 (low order byte is 0x00)"); - ret = inquiry(sd->iscsi_ctx, &task2, sd->iscsi_lun, 0, 0, 512, + ret = inquiry(sd, &task2, 0, 0, 512, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_inquiry_block_limits.c b/test-tool/test_inquiry_block_limits.c index 08d2338..75179bd 100644 --- a/test-tool/test_inquiry_block_limits.c +++ b/test-tool/test_inquiry_block_limits.c @@ -39,7 +39,7 @@ test_inquiry_block_limits(void) CHECK_FOR_SBC; logging(LOG_VERBOSE, "Block device. Verify that we can read Block Limits VPD"); - ret = inquiry(sd->iscsi_ctx, &bl_task, sd->iscsi_lun, + ret = inquiry(sd, &bl_task, 1, SCSI_INQUIRY_PAGECODE_BLOCK_LIMITS, 64, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -107,7 +107,7 @@ test_inquiry_block_limits(void) * MAXIMUM UNMAP BLOCK DESCRIPTOR COUNT */ logging(LOG_VERBOSE, "Try reading the logical block provisioning VPD"); - ret = inquiry(sd->iscsi_ctx, &lbp_task, sd->iscsi_lun, + ret = inquiry(sd, &lbp_task, 1, SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING, 64, EXPECT_STATUS_GOOD); if (ret == 0) { diff --git a/test-tool/test_inquiry_evpd.c b/test-tool/test_inquiry_evpd.c index 34a45bf..ad580d0 100644 --- a/test-tool/test_inquiry_evpd.c +++ b/test-tool/test_inquiry_evpd.c @@ -33,7 +33,7 @@ test_inquiry_evpd(void) logging(LOG_VERBOSE, "Test of the INQUIRY EVPD bit"); logging(LOG_VERBOSE, "Verify that INQUIRY with EVPD==0 and PC!=0 is an error"); - ret = inquiry(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 1, 256, + ret = inquiry(sd, NULL, 0, 1, 256, EXPECT_INVALID_FIELD_IN_CDB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_inquiry_mandatory_vpd_sbc.c b/test-tool/test_inquiry_mandatory_vpd_sbc.c index f5707a7..d9366cf 100644 --- a/test-tool/test_inquiry_mandatory_vpd_sbc.c +++ b/test-tool/test_inquiry_mandatory_vpd_sbc.c @@ -36,13 +36,13 @@ test_inquiry_mandatory_vpd_sbc(void) logging(LOG_VERBOSE, "SUPPORTED_VPD_PAGES is mandatory for SBC devices. Verify we can read it."); - ret = inquiry(sd->iscsi_ctx, NULL, sd->iscsi_lun, + ret = inquiry(sd, NULL, 1, SCSI_INQUIRY_PAGECODE_SUPPORTED_VPD_PAGES, 255, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "DEVICE_IDENTIFICATION is mandatory for SBC devices. Verify we can read it."); - ret = inquiry(sd->iscsi_ctx, NULL, sd->iscsi_lun, + ret = inquiry(sd, NULL, 1, SCSI_INQUIRY_PAGECODE_DEVICE_IDENTIFICATION, 255, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_inquiry_standard.c b/test-tool/test_inquiry_standard.c index 89be0c7..d4c110e 100644 --- a/test-tool/test_inquiry_standard.c +++ b/test-tool/test_inquiry_standard.c @@ -35,7 +35,7 @@ test_inquiry_standard(void) logging(LOG_VERBOSE, "Verify we can read standard INQUIRY page"); /* 260 bytes is the maximum possible size of the standard vpd */ - ret = inquiry(sd->iscsi_ctx, &task, sd->iscsi_lun, 0, 0, 260, + ret = inquiry(sd, &task, 0, 0, 260, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_inquiry_supported_vpd.c b/test-tool/test_inquiry_supported_vpd.c index 36344a2..8bc00fc 100644 --- a/test-tool/test_inquiry_supported_vpd.c +++ b/test-tool/test_inquiry_supported_vpd.c @@ -34,7 +34,7 @@ test_inquiry_supported_vpd(void) logging(LOG_VERBOSE, "Test INQUIRY supported VPD pages"); logging(LOG_VERBOSE, "Verify we can read the SUPPORTED VPD page"); - ret = inquiry(sd->iscsi_ctx, &task, sd->iscsi_lun, + ret = inquiry(sd, &task, 1, SCSI_INQUIRY_PAGECODE_SUPPORTED_VPD_PAGES, 255, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -56,7 +56,7 @@ test_inquiry_supported_vpd(void) logging(LOG_VERBOSE, "Verify we can read page 0x%02x", sup_inq->pages[i]); - ret = inquiry(sd->iscsi_ctx, NULL, sd->iscsi_lun, 1, sup_inq->pages[i], 255, + ret = inquiry(sd, NULL, 1, sup_inq->pages[i], 255, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_iscsi_cmdsn_toohigh.c b/test-tool/test_iscsi_cmdsn_toohigh.c index abbe353..013716a 100644 --- a/test-tool/test_iscsi_cmdsn_toohigh.c +++ b/test-tool/test_iscsi_cmdsn_toohigh.c @@ -64,7 +64,7 @@ void test_iscsi_cmdsn_toohigh(void) iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, -1); if (ret == -1) { @@ -76,7 +76,7 @@ void test_iscsi_cmdsn_toohigh(void) iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again"); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_iscsi_cmdsn_toolow.c b/test-tool/test_iscsi_cmdsn_toolow.c index 9809d04..0372f5f 100644 --- a/test-tool/test_iscsi_cmdsn_toolow.c +++ b/test-tool/test_iscsi_cmdsn_toolow.c @@ -64,7 +64,7 @@ void test_iscsi_cmdsn_toolow(void) iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, -1); if (ret == -1) { @@ -77,7 +77,7 @@ void test_iscsi_cmdsn_toolow(void) iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again"); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_iscsi_datasn_invalid.c b/test-tool/test_iscsi_datasn_invalid.c index b672e7f..7d7d7b9 100644 --- a/test-tool/test_iscsi_datasn_invalid.c +++ b/test-tool/test_iscsi_datasn_invalid.c @@ -75,7 +75,7 @@ void test_iscsi_datasn_invalid(void) iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 100, 2 * block_size, + ret = write10(sd, 100, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -98,7 +98,7 @@ void test_iscsi_datasn_invalid(void) iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 100, block_size, + ret = write10(sd, 100, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -121,7 +121,7 @@ void test_iscsi_datasn_invalid(void) iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 100, block_size, + ret = write10(sd, 100, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -145,7 +145,7 @@ void test_iscsi_datasn_invalid(void) iscsi_set_noautoreconnect(sd->iscsi_ctx, 1); iscsi_set_timeout(sd->iscsi_ctx, 3); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 100, 2 * block_size, + ret = write10(sd, 100, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { diff --git a/test-tool/test_mandatory_sbc.c b/test-tool/test_mandatory_sbc.c index ab5f3a9..011428a 100644 --- a/test-tool/test_mandatory_sbc.c +++ b/test-tool/test_mandatory_sbc.c @@ -37,38 +37,38 @@ test_mandatory_sbc(void) CHECK_FOR_SBC; logging(LOG_VERBOSE, "Test INQUIRY."); - ret = inquiry(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 0, 255, + ret = inquiry(sd, NULL, 0, 0, 255, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READCAPACITY10."); - ret = readcapacity10(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, + ret = readcapacity10(sd, 0, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); if (sbc3_support) { logging(LOG_VERBOSE, "Test READCAPACITY16. The device claims SBC-3 support."); - ret = readcapacity16(sd->iscsi_ctx, sd->iscsi_lun, 15, + ret = readcapacity16(sd, 15, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } logging(LOG_VERBOSE, "Test READ10."); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, block_size, block_size, + ret = read10(sd, NULL, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); if (sbc3_support) { logging(LOG_VERBOSE, "Test READ16. the device claims SBC-3 support."); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = read16(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } logging(LOG_VERBOSE, "Test TESTUNITREADY."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, 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 477f004..929fa63 100644 --- a/test-tool/test_nomedia_sbc.c +++ b/test-tool/test_nomedia_sbc.c @@ -43,17 +43,17 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Eject the medium."); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 1, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 1, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY when medium is ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test SYNCHRONIZECACHE10 when medium is ejected."); - ret = synchronizecache10(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 1, 1, + ret = synchronizecache10(sd, 0, 1, 1, 1, EXPECT_NO_MEDIUM); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " @@ -63,7 +63,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test SYNCHRONIZECACHE16 when medium is ejected."); - ret = synchronizecache16(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 1, 1, + ret = synchronizecache16(sd, 0, 1, 1, 1, EXPECT_NO_MEDIUM); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " @@ -73,30 +73,30 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test READ10 when medium is ejected."); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, block_size, block_size, + ret = read10(sd, NULL, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ12 when medium is ejected."); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = read12(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ16 when medium is ejected."); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = read16(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READCAPACITY10 when medium is ejected."); - ret = readcapacity10(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, + ret = readcapacity10(sd, 0, 0, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READCAPACITY16 when medium is ejected."); - ret = readcapacity16(sd->iscsi_ctx, sd->iscsi_lun, 15, + ret = readcapacity16(sd, 15, EXPECT_NO_MEDIUM); if (ret == -2) { if (sbc3_support) { @@ -110,7 +110,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test GET_LBA_STATUS when medium is ejected."); - ret = get_lba_status(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 24, + ret = get_lba_status(sd, NULL, 0, 24, EXPECT_NO_MEDIUM); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " @@ -120,7 +120,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test PREFETCH10 when medium is ejected."); - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 1, 0, EXPECT_NO_MEDIUM); + ret = prefetch10(sd, 0, 1, 1, 0, EXPECT_NO_MEDIUM); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " @@ -130,7 +130,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test PREFETCH16 when medium is ejected."); - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 1, 0, EXPECT_NO_MEDIUM); + ret = prefetch16(sd, 0, 1, 1, 0, EXPECT_NO_MEDIUM); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " "PREFETCH16"); @@ -139,7 +139,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test VERIFY10 when medium is ejected."); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = verify10(sd, 0, block_size, block_size, 0, 0, 1, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -150,7 +150,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test VERIFY12 when medium is ejected."); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = verify12(sd, 0, block_size, block_size, 0, 0, 1, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -161,7 +161,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test VERIFY16 when medium is ejected."); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = verify16(sd, 0, block_size, block_size, 0, 0, 1, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -177,25 +177,25 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test WRITE10 when medium is ejected."); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = write10(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE12 when medium is ejected."); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = write12(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE16 when medium is ejected."); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = write16(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY10 when medium is ejected."); - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = writeverify10(sd, 0, block_size, block_size, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -206,7 +206,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test WRITEVERIFY12 when medium is ejected."); - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = writeverify12(sd, 0, block_size, block_size, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -217,7 +217,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test WRITEVERIFY16 when medium is ejected."); - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = writeverify16(sd, 0, block_size, block_size, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -228,7 +228,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test ORWRITE when medium is ejected."); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = orwrite(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -242,7 +242,7 @@ test_nomedia_sbc(void) logging(LOG_VERBOSE, "[SKIPPED] Test not implemented yet"); logging(LOG_VERBOSE, "Test WRITESAME10 when medium is ejected."); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = writesame10(sd, 0, block_size, 1, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -253,7 +253,7 @@ test_nomedia_sbc(void) } logging(LOG_VERBOSE, "Test WRITESAME16 when medium is ejected."); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = writesame16(sd, 0, block_size, 1, 0, 0, 0, 0, buf, EXPECT_NO_MEDIUM); if (ret == -2) { @@ -266,7 +266,7 @@ test_nomedia_sbc(void) logging(LOG_VERBOSE, "Test UNMAP when medium is ejected."); list[0].lba = 0; list[0].num = lbppb; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_NO_MEDIUM); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] target does not support " @@ -278,7 +278,7 @@ test_nomedia_sbc(void) finished: logging(LOG_VERBOSE, "Load the medium again."); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 1, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 1, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_orwrite_0blocks.c b/test-tool/test_orwrite_0blocks.c index 5d7b641..0d3b0e3 100644 --- a/test-tool/test_orwrite_0blocks.c +++ b/test-tool/test_orwrite_0blocks.c @@ -33,7 +33,7 @@ test_orwrite_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test ORWRITE 0-blocks at LBA==0"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = orwrite(sd, 0, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -44,21 +44,21 @@ test_orwrite_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE 0-blocks one block past end-of-LUN"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, + ret = orwrite(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE 0-blocks at LBA==2^63"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = orwrite(sd, 0x8000000000000000ULL, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE 0-blocks at LBA==-1"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, -1, + ret = orwrite(sd, -1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_orwrite_beyond_eol.c b/test-tool/test_orwrite_beyond_eol.c index bc222f9..a4745af 100644 --- a/test-tool/test_orwrite_beyond_eol.c +++ b/test-tool/test_orwrite_beyond_eol.c @@ -40,7 +40,7 @@ test_orwrite_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = orwrite(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -57,7 +57,7 @@ test_orwrite_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = orwrite(sd, 0x8000000000000000ULL, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -69,7 +69,7 @@ test_orwrite_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, -1, + ret = orwrite(sd, -1, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -81,7 +81,7 @@ test_orwrite_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = orwrite(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_orwrite_flags.c b/test-tool/test_orwrite_flags.c index 8ea0cf4..3af9aa1 100644 --- a/test-tool/test_orwrite_flags.c +++ b/test-tool/test_orwrite_flags.c @@ -39,7 +39,7 @@ test_orwrite_flags(void) logging(LOG_VERBOSE, "Test ORWRITE flags"); logging(LOG_VERBOSE, "Test ORWRITE with DPO==1"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = orwrite(sd, 0, block_size, block_size, 0, 1, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -50,28 +50,28 @@ test_orwrite_flags(void) logging(LOG_VERBOSE, "Test ORWRITE with FUA==1 FUA_NV==0"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = orwrite(sd, 0, block_size, block_size, 0, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE with FUA==1 FUA_NV==1"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = orwrite(sd, 0, block_size, block_size, 0, 0, 1, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE with FUA==0 FUA_NV==1"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = orwrite(sd, 0, block_size, block_size, 0, 0, 0, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test ORWRITE with DPO==1 FUA==1 FUA_NV==1"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = orwrite(sd, 0, block_size, block_size, 0, 1, 1, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_orwrite_simple.c b/test-tool/test_orwrite_simple.c index 470df44..d1fb5c6 100644 --- a/test-tool/test_orwrite_simple.c +++ b/test-tool/test_orwrite_simple.c @@ -42,7 +42,7 @@ test_orwrite_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = orwrite(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -58,7 +58,7 @@ test_orwrite_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = orwrite(sd, 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_orwrite_verify.c b/test-tool/test_orwrite_verify.c index 2e7d505..061f872 100644 --- a/test-tool/test_orwrite_verify.c +++ b/test-tool/test_orwrite_verify.c @@ -47,14 +47,14 @@ test_orwrite_verify(void) logging(LOG_VERBOSE, "Write %d blocks of all-zero", i); memset(buf, 0, block_size * i); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = write10(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "OrWrite %d blocks with 0xa5", i); memset(buf, 0xa5, block_size * i); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = orwrite(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -65,7 +65,7 @@ test_orwrite_verify(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, readbuf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -76,13 +76,13 @@ test_orwrite_verify(void) logging(LOG_VERBOSE, "OrWrite %d blocks with 0x5a", i); memset(buf, 0x5a, block_size * i); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = orwrite(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, readbuf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -101,20 +101,20 @@ test_orwrite_verify(void) logging(LOG_VERBOSE, "Write %d blocks of all-zero", i); memset(buf, 0, block_size * i); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = write16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "OrWrite %d blocks with 0xa5", i); memset(buf, 0xa5, block_size * i); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = orwrite(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = read16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, readbuf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -125,13 +125,13 @@ test_orwrite_verify(void) logging(LOG_VERBOSE, "OrWrite %d blocks with 0x5a", i); memset(buf, 0x5a, block_size * i); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = orwrite(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read %d blocks back", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i * block_size, + ret = read16(sd, num_blocks - i, 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_orwrite_wrprotect.c b/test-tool/test_orwrite_wrprotect.c index d99e842..fd1e6be 100644 --- a/test-tool/test_orwrite_wrprotect.c +++ b/test-tool/test_orwrite_wrprotect.c @@ -44,7 +44,7 @@ test_orwrite_wrprotect(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 = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = orwrite(sd, 0, block_size, block_size, i, 0, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_prefetch10_0blocks.c b/test-tool/test_prefetch10_0blocks.c index 73b8c89..51736fb 100644 --- a/test-tool/test_prefetch10_0blocks.c +++ b/test-tool/test_prefetch10_0blocks.c @@ -30,7 +30,7 @@ test_prefetch10_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks at LBA==0"); - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, + ret = prefetch10(sd, 0, 0, 0, 0, EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented."); @@ -45,19 +45,19 @@ test_prefetch10_0blocks(void) } logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks one block past end-of-LUN"); - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, 0, 0, + ret = prefetch10(sd, num_blocks + 1, 0, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks at LBA==2^31"); - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, 0, 0, 0, + ret = prefetch10(sd, 0x80000000, 0, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks at LBA==-1"); - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, 0, 0, + ret = prefetch10(sd, -1, 0, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch10_beyond_eol.c b/test-tool/test_prefetch10_beyond_eol.c index f5c0704..d663af9 100644 --- a/test-tool/test_prefetch10_beyond_eol.c +++ b/test-tool/test_prefetch10_beyond_eol.c @@ -37,7 +37,7 @@ test_prefetch10_beyond_eol(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, i, 0, 0, + ret = prefetch10(sd, num_blocks + 1 - i, i, 0, 0, EXPECT_LBA_OOB); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented."); @@ -50,7 +50,7 @@ test_prefetch10_beyond_eol(void) logging(LOG_VERBOSE, "Test PREFETCH10 1-256 blocks at LBA==2^31"); for (i = 1; i <= 256; i++) { - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, i, 0, 0, + ret = prefetch10(sd, 0x80000000, i, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } @@ -58,7 +58,7 @@ test_prefetch10_beyond_eol(void) logging(LOG_VERBOSE, "Test PREFETCH10 1-256 blocks at LBA==-1"); for (i = 1; i <= 256; i++) { - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, -1, i, 0, 0, + ret = prefetch10(sd, -1, i, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } @@ -66,7 +66,7 @@ test_prefetch10_beyond_eol(void) logging(LOG_VERBOSE, "Test PREFETCH10 2-256 blocks all but one block beyond the end"); for (i = 2; i <= 256; i++) { - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, i, 0, 0, + ret = prefetch10(sd, num_blocks - 1, i, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch10_flags.c b/test-tool/test_prefetch10_flags.c index a59a21f..8846798 100644 --- a/test-tool/test_prefetch10_flags.c +++ b/test-tool/test_prefetch10_flags.c @@ -34,7 +34,7 @@ test_prefetch10_flags(void) logging(LOG_VERBOSE, "Test PREFETCH10 flags"); logging(LOG_VERBOSE, "Test PREFETCH10 with IMMED==1"); - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 1, 0, + ret = prefetch10(sd, 0, 1, 1, 0, EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented."); @@ -44,12 +44,12 @@ test_prefetch10_flags(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH10 with GROUP==3"); - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 0, 3, + ret = prefetch10(sd, 0, 1, 0, 3, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH10 with IMMED=1 and GROUP==3"); - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 1, 3, + ret = prefetch10(sd, 0, 1, 1, 3, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch10_simple.c b/test-tool/test_prefetch10_simple.c index ca0351b..89fe426 100644 --- a/test-tool/test_prefetch10_simple.c +++ b/test-tool/test_prefetch10_simple.c @@ -33,7 +33,7 @@ test_prefetch10_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, 0, i, 0, 0, + ret = prefetch10(sd, 0, i, 0, 0, EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH10 is not implemented."); @@ -46,7 +46,7 @@ test_prefetch10_simple(void) logging(LOG_VERBOSE, "Test PREFETCH10 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { - ret = prefetch10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i, 0, 0, + ret = prefetch10(sd, num_blocks - i, i, 0, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch16_0blocks.c b/test-tool/test_prefetch16_0blocks.c index 6620d80..79ede7b 100644 --- a/test-tool/test_prefetch16_0blocks.c +++ b/test-tool/test_prefetch16_0blocks.c @@ -30,7 +30,7 @@ test_prefetch16_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks at LBA==0"); - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, + ret = prefetch16(sd, 0, 0, 0, 0, EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented."); @@ -40,19 +40,19 @@ test_prefetch16_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks one block past end-of-LUN"); - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, 0, 0, + ret = prefetch16(sd, num_blocks + 1, 0, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks at LBA==2^63"); - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, 0, 0, 0, + ret = prefetch16(sd, 0x8000000000000000ULL, 0, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks at LBA==-1"); - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, 0, 0, + ret = prefetch16(sd, -1, 0, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch16_beyond_eol.c b/test-tool/test_prefetch16_beyond_eol.c index 069e250..ca5df11 100644 --- a/test-tool/test_prefetch16_beyond_eol.c +++ b/test-tool/test_prefetch16_beyond_eol.c @@ -32,7 +32,7 @@ test_prefetch16_beyond_eol(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, i, 0, 0, + ret = prefetch16(sd, num_blocks + 1 - i, i, 0, 0, EXPECT_LBA_OOB); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented."); @@ -45,7 +45,7 @@ test_prefetch16_beyond_eol(void) logging(LOG_VERBOSE, "Test PREFETCH16 1-256 blocks at LBA==2^63"); for (i = 1; i <= 256; i++) { - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = prefetch16(sd, 0x8000000000000000ULL, i, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -54,7 +54,7 @@ test_prefetch16_beyond_eol(void) logging(LOG_VERBOSE, "Test PREFETCH16 1-256 blocks at LBA==-1"); for (i = 1; i <= 256; i++) { - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, -1, i, 0, 0, + ret = prefetch16(sd, -1, i, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } @@ -62,7 +62,7 @@ test_prefetch16_beyond_eol(void) logging(LOG_VERBOSE, "Test PREFETCH16 2-256 blocks all but one block beyond the end"); for (i = 2; i <= 256; i++) { - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, i, 0, 0, + ret = prefetch16(sd, num_blocks - 1, i, 0, 0, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch16_flags.c b/test-tool/test_prefetch16_flags.c index 3f24e9f..384a1a7 100644 --- a/test-tool/test_prefetch16_flags.c +++ b/test-tool/test_prefetch16_flags.c @@ -34,7 +34,7 @@ test_prefetch16_flags(void) logging(LOG_VERBOSE, "Test PREFETCH16 flags"); logging(LOG_VERBOSE, "Test PREFETCH16 with IMMED==1"); - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 1, 0, + ret = prefetch16(sd, 0, 1, 1, 0, EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented."); @@ -44,12 +44,12 @@ test_prefetch16_flags(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 with GROUP==3"); - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 0, 3, + ret = prefetch16(sd, 0, 1, 0, 3, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test PREFETCH16 with IMMED=1 and GROUP==3"); - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, 0, 1, 1, 3, + ret = prefetch16(sd, 0, 1, 1, 3, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prefetch16_simple.c b/test-tool/test_prefetch16_simple.c index 92725ec..587677f 100644 --- a/test-tool/test_prefetch16_simple.c +++ b/test-tool/test_prefetch16_simple.c @@ -33,7 +33,7 @@ test_prefetch16_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, 0, i, 0, 0, + ret = prefetch16(sd, 0, i, 0, 0, EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PREFETCH16 is not implemented."); @@ -46,7 +46,7 @@ test_prefetch16_simple(void) logging(LOG_VERBOSE, "Test PREFETCH16 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { - ret = prefetch16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, i, 0, 0, + ret = prefetch16(sd, num_blocks - i, i, 0, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_preventallow_2_itnexuses.c b/test-tool/test_preventallow_2_itnexuses.c index 6a9b0d1..a14854c 100644 --- a/test-tool/test_preventallow_2_itnexuses.c +++ b/test-tool/test_preventallow_2_itnexuses.c @@ -28,6 +28,7 @@ void test_preventallow_2_itnexuses(void) { int ret; + struct scsi_device sd2; CHECK_FOR_SBC; CHECK_FOR_REMOVABLE; @@ -36,45 +37,45 @@ test_preventallow_2_itnexuses(void) logging(LOG_VERBOSE, "Test that PREVENT MEDIUM REMOVAL are seen on other nexuses as well"); logging(LOG_VERBOSE, "Set the PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can still access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_VERBOSE, "Try to eject the medium on the second connection"); - ret = startstopunit(iscsic2, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(&sd2, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Logout the second connection from target"); - iscsi_logout_sync(iscsic2); - iscsi_destroy_context(iscsic2); + iscsi_logout_sync(sd2.iscsi_ctx); + iscsi_destroy_context(sd2.iscsi_ctx); logging(LOG_VERBOSE, "Clear PREVENT and load medium in case target failed"); logging(LOG_VERBOSE, "Test we can clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_preventallow_cold_reset.c b/test-tool/test_preventallow_cold_reset.c index 81eec21..5ccf5fa 100644 --- a/test-tool/test_preventallow_cold_reset.c +++ b/test-tool/test_preventallow_cold_reset.c @@ -36,16 +36,16 @@ test_preventallow_cold_reset(void) logging(LOG_VERBOSE, "Test that Target Warm Reset clears PREVENT MEDIUM REMOVAL"); logging(LOG_VERBOSE, "Set the PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can still access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -53,33 +53,33 @@ test_preventallow_cold_reset(void) logging(LOG_VERBOSE, "Perform cold reset on target"); ret = iscsi_task_mgmt_target_cold_reset_sync(sd->iscsi_ctx); logging(LOG_VERBOSE, "Wait until all unit attentions clear"); - while (testunitready(sd->iscsi_ctx, sd->iscsi_lun, EXPECT_STATUS_GOOD) != 0); + while (testunitready(sd, EXPECT_STATUS_GOOD) != 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can not access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Clear PREVENT and load medium in case target failed"); logging(LOG_VERBOSE, "Test we can clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_preventallow_eject.c b/test-tool/test_preventallow_eject.c index de38b4d..0f50357 100644 --- a/test-tool/test_preventallow_eject.c +++ b/test-tool/test_preventallow_eject.c @@ -36,48 +36,48 @@ test_preventallow_eject(void) logging(LOG_VERBOSE, "Test that we can not eject medium when PREVENT is active"); logging(LOG_VERBOSE, "Set the PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can still access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test we can clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can not access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Set the PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium again"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_preventallow_itnexus_loss.c b/test-tool/test_preventallow_itnexus_loss.c index 038254c..ac4ccb4 100644 --- a/test-tool/test_preventallow_itnexus_loss.c +++ b/test-tool/test_preventallow_itnexus_loss.c @@ -36,16 +36,16 @@ test_preventallow_itnexus_loss(void) logging(LOG_VERBOSE, "Test that IT-Nexus loss clears PREVENT MEDIUM REMOVAL"); logging(LOG_VERBOSE, "Set the PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can still access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -61,28 +61,28 @@ test_preventallow_itnexus_loss(void) } logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can not access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Clear PREVENT and load medium in case target failed"); logging(LOG_VERBOSE, "Test we can clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_preventallow_logout.c b/test-tool/test_preventallow_logout.c index 9280f76..d92238a 100644 --- a/test-tool/test_preventallow_logout.c +++ b/test-tool/test_preventallow_logout.c @@ -36,16 +36,16 @@ test_preventallow_logout(void) logging(LOG_VERBOSE, "Test that Logout loss clears PREVENT MEDIUM REMOVAL"); logging(LOG_VERBOSE, "Set the PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can still access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -62,28 +62,28 @@ test_preventallow_logout(void) } logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can not access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Clear PREVENT and load medium in case target failed"); logging(LOG_VERBOSE, "Test we can clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_preventallow_lun_reset.c b/test-tool/test_preventallow_lun_reset.c index fd1cb0e..7efb2b8 100644 --- a/test-tool/test_preventallow_lun_reset.c +++ b/test-tool/test_preventallow_lun_reset.c @@ -36,16 +36,16 @@ test_preventallow_lun_reset(void) logging(LOG_VERBOSE, "Test that Target Warm Reset clears PREVENT MEDIUM REMOVAL"); logging(LOG_VERBOSE, "Set the PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can still access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -54,32 +54,32 @@ test_preventallow_lun_reset(void) ret = iscsi_task_mgmt_lun_reset_sync(sd->iscsi_ctx, sd->iscsi_lun); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Wait until all unit attentions clear"); - while (testunitready(sd->iscsi_ctx, sd->iscsi_lun, EXPECT_STATUS_GOOD) != 0); + while (testunitready(sd, EXPECT_STATUS_GOOD) != 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can not access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Clear PREVENT and load medium in case target failed"); logging(LOG_VERBOSE, "Test we can clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_preventallow_simple.c b/test-tool/test_preventallow_simple.c index 9d74822..a76fbdb 100644 --- a/test-tool/test_preventallow_simple.c +++ b/test-tool/test_preventallow_simple.c @@ -36,10 +36,10 @@ test_preventallow_simple(void) logging(LOG_VERBOSE, "Test PREVENTALLOW basics"); logging(LOG_VERBOSE, "Test we can set PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test we can clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_preventallow_warm_reset.c b/test-tool/test_preventallow_warm_reset.c index cf610e2..87c68f8 100644 --- a/test-tool/test_preventallow_warm_reset.c +++ b/test-tool/test_preventallow_warm_reset.c @@ -36,16 +36,16 @@ test_preventallow_warm_reset(void) logging(LOG_VERBOSE, "Test that Target Warm Reset clears PREVENT MEDIUM REMOVAL"); logging(LOG_VERBOSE, "Set the PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 1); + ret = preventallow(sd, 1); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_REMOVAL_PREVENTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can still access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -54,32 +54,32 @@ test_preventallow_warm_reset(void) ret = iscsi_task_mgmt_target_warm_reset_sync(sd->iscsi_ctx); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Wait until all unit attentions clear"); - while (testunitready(sd->iscsi_ctx, sd->iscsi_lun, EXPECT_STATUS_GOOD) != 0); + while (testunitready(sd, EXPECT_STATUS_GOOD) != 0); logging(LOG_VERBOSE, "Try to eject the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can not access the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 0, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Clear PREVENT and load medium in case target failed"); logging(LOG_VERBOSE, "Test we can clear PREVENT flag"); - ret = preventallow(sd->iscsi_ctx, sd->iscsi_lun, 0); + ret = preventallow(sd, 0); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Load the medium"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, 0, 0, 1, 1, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_prin_read_keys_simple.c b/test-tool/test_prin_read_keys_simple.c index feee29a..e7c006b 100644 --- a/test-tool/test_prin_read_keys_simple.c +++ b/test-tool/test_prin_read_keys_simple.c @@ -36,7 +36,7 @@ test_prin_read_keys_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test Persistent Reserve IN READ_KEYS works."); - ret = prin_read_keys(sd->iscsi_ctx, sd->iscsi_lun, &task, NULL); + ret = prin_read_keys(sd, &task, NULL); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE IN is not implemented."); CU_PASS("PERSISTENT RESERVE IN is not implemented."); diff --git a/test-tool/test_prin_serviceaction_range.c b/test-tool/test_prin_serviceaction_range.c index 3e43fd1..0c9912e 100644 --- a/test-tool/test_prin_serviceaction_range.c +++ b/test-tool/test_prin_serviceaction_range.c @@ -37,7 +37,7 @@ test_prin_serviceaction_range(void) logging(LOG_VERBOSE, "Test Persistent Reserve IN Serviceaction range."); /* verify PRIN/READ_KEYS works -- XXX redundant -- remove this? */ - ret = prin_read_keys(sd->iscsi_ctx, sd->iscsi_lun, &task, NULL); + ret = prin_read_keys(sd, &task, NULL); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE IN is not implemented."); CU_PASS("PERSISTENT RESERVE IN is not implemented."); @@ -47,13 +47,13 @@ test_prin_serviceaction_range(void) /* verify that PRIN/SA={0,1,2,3} works ... */ for (i = 0; i < 4; i++) { - ret = prin_task(sd->iscsi_ctx, sd->iscsi_lun, i, 1); + ret = prin_task(sd, i, 1); CU_ASSERT_EQUAL(ret, 0); } /* verify that PRIN/SA={4..0x20} fails ... */ for (i = 4; i < 0x20; i++) { - ret = prin_task(sd->iscsi_ctx, sd->iscsi_lun, i, 0); + ret = prin_task(sd, i, 0); CU_ASSERT_EQUAL(ret, 0); } } diff --git a/test-tool/test_prout_register_simple.c b/test-tool/test_prout_register_simple.c index d71f1a0..a95f39b 100644 --- a/test-tool/test_prout_register_simple.c +++ b/test-tool/test_prout_register_simple.c @@ -37,7 +37,7 @@ test_prout_register_simple(void) logging(LOG_VERBOSE, "Test Persistent Reserve IN REGISTER works."); /* register our reservation key with the target */ - ret = prout_register_and_ignore(sd->iscsi_ctx, sd->iscsi_lun, key); + ret = prout_register_and_ignore(sd, key); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); @@ -46,18 +46,18 @@ test_prout_register_simple(void) CU_ASSERT_EQUAL(ret, 0); /* verify we can read the registration */ - ret = prin_verify_key_presence(sd->iscsi_ctx, sd->iscsi_lun, key, 1); + ret = prin_verify_key_presence(sd, key, 1); CU_ASSERT_EQUAL(ret, 0); /* try to reregister, which should fail */ - ret = prout_reregister_key_fails(sd->iscsi_ctx, sd->iscsi_lun, key+1); + ret = prout_reregister_key_fails(sd, key+1); CU_ASSERT_EQUAL(ret, 0); /* release from the target */ - ret = prout_register_key(sd->iscsi_ctx, sd->iscsi_lun, 0, key); + ret = prout_register_key(sd, 0, key); CU_ASSERT_EQUAL(ret, 0); /* Verify the registration is gone */ - ret = prin_verify_key_presence(sd->iscsi_ctx, sd->iscsi_lun, key, 0); + ret = prin_verify_key_presence(sd, key, 0); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_prout_reserve_access.c b/test-tool/test_prout_reserve_access.c index cf9d6b0..94a1f63 100644 --- a/test-tool/test_prout_reserve_access.c +++ b/test-tool/test_prout_reserve_access.c @@ -25,8 +25,7 @@ static void -verify_persistent_reserve_access(struct iscsi_context *iscsi1, int lun1, - struct iscsi_context *iscsi2, int lun2, +verify_persistent_reserve_access(struct scsi_device *sd1, struct scsi_device *sd2, const enum scsi_persistent_out_type pr_type, int reg_i2_can_read, int reg_i2_can_write, @@ -44,26 +43,26 @@ verify_persistent_reserve_access(struct iscsi_context *iscsi1, int lun1, scsi_pr_type_str(pr_type)); /* send TURs to clear possible check conditions */ - (void) testunitready_clear_ua(iscsi1, lun1); - (void) testunitready_clear_ua(iscsi2, lun2); + (void) testunitready_clear_ua(sd1); + (void) testunitready_clear_ua(sd2); /* register our reservation key with the target */ - ret = prout_register_and_ignore(iscsi1, lun1, key); + ret = prout_register_and_ignore(sd1, key); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; } CU_ASSERT_EQUAL(0, ret); - ret = prout_register_and_ignore(iscsi2, lun2, key2); + ret = prout_register_and_ignore(sd2, key2); CU_ASSERT_EQUAL(0, ret); /* reserve the target through initiator 1 */ - ret = prout_reserve(iscsi1, lun1, key, pr_type); + ret = prout_reserve(sd1, key, pr_type); CU_ASSERT_EQUAL(0, ret); /* verify target reservation */ - ret = prin_verify_reserved_as(iscsi1, lun1, + ret = prin_verify_reserved_as(sd1, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); CU_ASSERT_EQUAL(0, ret); @@ -72,58 +71,62 @@ verify_persistent_reserve_access(struct iscsi_context *iscsi1, int lun1, CU_ASSERT_PTR_NOT_NULL(read_write_buf); /* make sure init1 can read */ - ret = verify_read_works(iscsi1, lun1, read_write_buf); + ret = verify_read_works(sd1, read_write_buf); CU_ASSERT_EQUAL(0, ret); /* make sure init1 can write */ - ret = verify_write_works(iscsi1, lun1, read_write_buf); + ret = verify_write_works(sd1, read_write_buf); CU_ASSERT_EQUAL(0, ret); /* verify registered init2 read access */ if (reg_i2_can_read) - ret = verify_read_works(iscsi2, lun2, read_write_buf); + ret = verify_read_works(sd2, read_write_buf); else - ret = verify_read_fails(iscsi2, lun2, read_write_buf); + ret = verify_read_fails(sd2, read_write_buf); CU_ASSERT_EQUAL(0, ret); /* verify registered init2 write access */ if (reg_i2_can_write) - ret = verify_write_works(iscsi2, lun2, read_write_buf); + ret = verify_write_works(sd2, read_write_buf); else - ret = verify_write_fails(iscsi2, lun2, read_write_buf); + ret = verify_write_fails(sd2, read_write_buf); CU_ASSERT_EQUAL(0, ret); /* unregister init2 */ - ret = prout_register_key(iscsi2, lun2, 0, key); + ret = prout_register_key(sd2, 0, key); CU_ASSERT_EQUAL(0, ret); /* verify unregistered init2 read access */ if (unreg_i2_can_read) - ret = verify_read_works(iscsi2, lun2, read_write_buf); + ret = verify_read_works(sd2, read_write_buf); else - ret = verify_read_fails(iscsi2, lun2, read_write_buf); + ret = verify_read_fails(sd2, read_write_buf); CU_ASSERT_EQUAL(0, ret); /* verify unregistered init2 write access */ if (unreg_i2_can_write) - ret = verify_write_works(iscsi2, lun2, read_write_buf); + ret = verify_write_works(sd2, read_write_buf); else - ret = verify_write_fails(iscsi2, lun2, read_write_buf); + ret = verify_write_fails(sd2, read_write_buf); CU_ASSERT_EQUAL(0, ret); /* release our reservation */ - ret = prout_release(iscsi1, lun1, key, pr_type); + ret = prout_release(sd1, key, pr_type); CU_ASSERT_EQUAL(0, ret); /* remove our key from the target */ - ret = prout_register_key(iscsi1, lun1, 0, key); + ret = prout_register_key(sd1, 0, key); CU_ASSERT_EQUAL(0, ret); } void test_prout_reserve_access_ea(void) { - verify_persistent_reserve_access(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_access(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS, 0, 0, 0, 0); } @@ -131,7 +134,11 @@ test_prout_reserve_access_ea(void) void test_prout_reserve_access_we(void) { - verify_persistent_reserve_access(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_access(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE, 1, 0, 1, 0); } @@ -139,7 +146,11 @@ test_prout_reserve_access_we(void) void test_prout_reserve_access_earo(void) { - verify_persistent_reserve_access(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_access(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS_REGISTRANTS_ONLY, 1, 1, 0, 0); } @@ -147,7 +158,11 @@ test_prout_reserve_access_earo(void) void test_prout_reserve_access_wero(void) { - verify_persistent_reserve_access(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_access(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE_REGISTRANTS_ONLY, 1, 1, 1, 0); } @@ -155,7 +170,11 @@ test_prout_reserve_access_wero(void) void test_prout_reserve_access_eaar(void) { - verify_persistent_reserve_access(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_access(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS_ALL_REGISTRANTS, 1, 1, 0, 0); } @@ -163,7 +182,11 @@ test_prout_reserve_access_eaar(void) void test_prout_reserve_access_wear(void) { - verify_persistent_reserve_access(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_access(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE_ALL_REGISTRANTS, 1, 1, 1, 0); } diff --git a/test-tool/test_prout_reserve_ownership.c b/test-tool/test_prout_reserve_ownership.c index 28b33d1..6898e08 100644 --- a/test-tool/test_prout_reserve_ownership.c +++ b/test-tool/test_prout_reserve_ownership.c @@ -25,8 +25,7 @@ static void -verify_persistent_reserve_ownership(struct iscsi_context *iscsi1, int lun1, - struct iscsi_context *iscsi2, int lun2, +verify_persistent_reserve_ownership(struct scsi_device *sd1, struct scsi_device *sd2, const enum scsi_persistent_out_type pr_type, int resvn_is_shared) { @@ -41,97 +40,121 @@ verify_persistent_reserve_ownership(struct iscsi_context *iscsi1, int lun1, scsi_pr_type_str(pr_type)); /* send TURs to clear possible check conditions */ - (void) testunitready_clear_ua(iscsi1, lun1); - (void) testunitready_clear_ua(iscsi2, lun2); + (void) testunitready_clear_ua(sd1); + (void) testunitready_clear_ua(sd2); /* register our reservation key with the target */ - ret = prout_register_and_ignore(iscsi1, lun1, key1); + ret = prout_register_and_ignore(sd1, key1); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); return; } CU_ASSERT_EQUAL(0, ret); - ret = prout_register_and_ignore(iscsi2, lun2, key2); + ret = prout_register_and_ignore(sd2, key2); CU_ASSERT_EQUAL(0, ret); /* reserve the target through initiator 1 */ - ret = prout_reserve(iscsi1, lun1, key1, pr_type); + ret = prout_reserve(sd1, key1, pr_type); CU_ASSERT_EQUAL(0, ret); /* verify target reservation */ - ret = prin_verify_reserved_as(iscsi1, lun1, + ret = prin_verify_reserved_as(sd1, pr_type_is_all_registrants(pr_type) ? 0 : key1, pr_type); CU_ASSERT_EQUAL(0, ret); /* unregister init1 */ - ret = prout_register_key(iscsi1, lun1, 0, key1); + ret = prout_register_key(sd1, 0, key1); CU_ASSERT_EQUAL(0, ret); /* verify if reservation is still present */ if (resvn_is_shared) { /* verify target reservation */ - ret = prin_verify_reserved_as(iscsi1, lun1, + ret = prin_verify_reserved_as(sd1, pr_type_is_all_registrants(pr_type) ? 0 : key1, pr_type); CU_ASSERT_EQUAL(0, ret); /* release our reservation */ - ret = prout_release(iscsi2, lun2, key2, pr_type); + ret = prout_release(sd2, key2, pr_type); CU_ASSERT_EQUAL(0, ret); } else { /* verify target is not reserved now */ - ret = prin_verify_not_reserved(iscsi1, lun1); + ret = prin_verify_not_reserved(sd1); CU_ASSERT_EQUAL(0, ret); /* send TUR to clear possible check condition */ - (void) testunitready_clear_ua(iscsi2, lun2); + (void) testunitready_clear_ua(sd2); } /* remove our remaining key from the target */ - ret = prout_register_key(iscsi2, lun2, 0, key2); + ret = prout_register_key(sd2, 0, key2); CU_ASSERT_EQUAL(0, ret); } void test_prout_reserve_ownership_ea(void) { - verify_persistent_reserve_ownership(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_ownership(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS, 0); } void test_prout_reserve_ownership_we(void) { - verify_persistent_reserve_ownership(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_ownership(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE, 0); } void test_prout_reserve_ownership_earo(void) { - verify_persistent_reserve_ownership(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_ownership(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS_REGISTRANTS_ONLY, 0); } void test_prout_reserve_ownership_wero(void) { - verify_persistent_reserve_ownership(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_ownership(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE_REGISTRANTS_ONLY, 0); } void test_prout_reserve_ownership_eaar(void) { - verify_persistent_reserve_ownership(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_ownership(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS_ALL_REGISTRANTS, 1); } void test_prout_reserve_ownership_wear(void) { - verify_persistent_reserve_ownership(sd->iscsi_ctx, sd->iscsi_lun, iscsic2, tgt_lun2, + struct scsi_device sd2; + + sd2.iscsi_ctx = iscsic2; + sd2.iscsi_lun = tgt_lun2; + verify_persistent_reserve_ownership(sd, &sd2, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE_ALL_REGISTRANTS, 1); } diff --git a/test-tool/test_prout_reserve_simple.c b/test-tool/test_prout_reserve_simple.c index 90144d5..8ab149c 100644 --- a/test-tool/test_prout_reserve_simple.c +++ b/test-tool/test_prout_reserve_simple.c @@ -52,7 +52,7 @@ test_prout_reserve_simple(void) logging(LOG_VERBOSE, "Test Persistent Reserve IN RESERVE works."); /* register our reservation key with the target */ - ret = prout_register_and_ignore(sd->iscsi_ctx, sd->iscsi_lun, key); + ret = prout_register_and_ignore(sd, key); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] PERSISTEN RESERVE OUT is not implemented."); CU_PASS("PERSISTENT RESERVE OUT is not implemented."); @@ -65,22 +65,22 @@ test_prout_reserve_simple(void) enum scsi_persistent_out_type pr_type = pr_types_to_test[i]; /* reserve the target */ - ret = prout_reserve(sd->iscsi_ctx, sd->iscsi_lun, key, pr_type); + ret = prout_reserve(sd, key, pr_type); CU_ASSERT_EQUAL(ret, 0); /* verify target reservation */ - ret = prin_verify_reserved_as(sd->iscsi_ctx, sd->iscsi_lun, + ret = prin_verify_reserved_as(sd, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); CU_ASSERT_EQUAL(ret, 0); /* release our reservation */ - ret = prout_release(sd->iscsi_ctx, sd->iscsi_lun, key, pr_type); + ret = prout_release(sd, key, pr_type); CU_ASSERT_EQUAL(ret, 0); } /* remove our key from the target */ - ret = prout_register_key(sd->iscsi_ctx, sd->iscsi_lun, 0, key); + ret = prout_register_key(sd, 0, key); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_read10_0blocks.c b/test-tool/test_read10_0blocks.c index 0c870a1..dced0f4 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 0, block_size, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks + 1, 0, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0x80000000, 0, block_size, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, -1, 0, block_size, + ret = read10(sd, NULL, -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 148693a..236ebe4 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(sd->iscsi_ctx, NULL,sd->iscsi_lun, num_blocks + 1 - i, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0x80000000, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, -1, i * block_size, + ret = read10(sd, NULL, -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(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks - 1, + ret = read10(sd, NULL, 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 d0ed3f2..2814ae9 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, + ret = read10(sd, NULL, 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 028f30d..b2c764f 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, + ret = read10(sd, NULL, 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 c142a12..233bde8 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(sd->iscsi_ctx, NULL,sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks - i, + ret = read10(sd, NULL, 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_read12_0blocks.c b/test-tool/test_read12_0blocks.c index 09e3827..35ff1f4 100644 --- a/test-tool/test_read12_0blocks.c +++ b/test-tool/test_read12_0blocks.c @@ -30,7 +30,7 @@ test_read12_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ12 0-blocks at LBA==0"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = read12(sd, 0, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -46,21 +46,21 @@ test_read12_0blocks(void) } logging(LOG_VERBOSE, "Test READ12 0-blocks one block past end-of-LUN"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = read12(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ12 0-blocks at LBA==2^31"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, 0, block_size, + ret = read12(sd, 0x80000000, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ12 0-blocks at LBA==-1"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = read12(sd, -1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_read12_beyond_eol.c b/test-tool/test_read12_beyond_eol.c index ea214d2..4afeb14 100644 --- a/test-tool/test_read12_beyond_eol.c +++ b/test-tool/test_read12_beyond_eol.c @@ -40,7 +40,7 @@ test_read12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = read12(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); if (ret == -2) { @@ -57,7 +57,7 @@ test_read12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = read12(sd, 0x80000000, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -69,7 +69,7 @@ test_read12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = read12(sd, -1, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -81,7 +81,7 @@ test_read12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = read12(sd, 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_read12_flags.c b/test-tool/test_read12_flags.c index 75161b0..095b6b9 100644 --- a/test-tool/test_read12_flags.c +++ b/test-tool/test_read12_flags.c @@ -36,7 +36,7 @@ test_read12_flags(void) CHECK_FOR_SBC; logging(LOG_VERBOSE, "Test READ12 with DPO==1"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read12(sd, 0, block_size, block_size, 0, 1, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -48,28 +48,28 @@ test_read12_flags(void) logging(LOG_VERBOSE, "Test READ12 with FUA==1 FUA_NV==0"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read12(sd, 0, block_size, block_size, 0, 0, 1, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ12 with FUA==1 FUA_NV==1"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read12(sd, 0, block_size, block_size, 0, 0, 1, 1, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ12 with FUA==0 FUA_NV==1"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read12(sd, 0, block_size, block_size, 0, 0, 0, 1, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ12 with DPO==1 FUA==1 FUA_NV==1"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read12(sd, 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_read12_rdprotect.c b/test-tool/test_read12_rdprotect.c index 125fe7b..9efddfd 100644 --- a/test-tool/test_read12_rdprotect.c +++ b/test-tool/test_read12_rdprotect.c @@ -41,7 +41,7 @@ test_read12_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 = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read12(sd, 0, block_size, block_size, i, 0, 0, 0, 0, NULL, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_read12_simple.c b/test-tool/test_read12_simple.c index 00c720b..8846e98 100644 --- a/test-tool/test_read12_simple.c +++ b/test-tool/test_read12_simple.c @@ -37,7 +37,7 @@ test_read12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read12(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -54,7 +54,7 @@ test_read12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read12(sd, 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_read16_0blocks.c b/test-tool/test_read16_0blocks.c index c72ce03..c7e0928 100644 --- a/test-tool/test_read16_0blocks.c +++ b/test-tool/test_read16_0blocks.c @@ -32,7 +32,7 @@ test_read16_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ16 0-blocks at LBA==0"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = read16(sd, 0, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -43,21 +43,21 @@ test_read16_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ16 0-blocks one block past end-of-LUN"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = read16(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ16 0-blocks at LBA==2^63"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, 0, + ret = read16(sd, 0x8000000000000000ULL, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ16 0-blocks at LBA==-1"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = read16(sd, -1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_read16_beyond_eol.c b/test-tool/test_read16_beyond_eol.c index 47e7b53..6e6138e 100644 --- a/test-tool/test_read16_beyond_eol.c +++ b/test-tool/test_read16_beyond_eol.c @@ -49,7 +49,7 @@ test_read16_beyond_eol(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = read16(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); if (ret == -2) { @@ -67,7 +67,7 @@ test_read16_beyond_eol(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = read16(sd, 0x8000000000000000ULL, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -81,7 +81,7 @@ test_read16_beyond_eol(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, + ret = read16(sd, 1ULL << (64 - ilog2(block_size)), i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); @@ -96,7 +96,7 @@ test_read16_beyond_eol(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, + ret = read16(sd, 1ULL << (63 - ilog2(block_size)), i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); @@ -110,7 +110,7 @@ test_read16_beyond_eol(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = read16(sd, -1, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -123,7 +123,7 @@ test_read16_beyond_eol(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = read16(sd, 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_read16_flags.c b/test-tool/test_read16_flags.c index 763aff7..6f355f5 100644 --- a/test-tool/test_read16_flags.c +++ b/test-tool/test_read16_flags.c @@ -36,7 +36,7 @@ test_read16_flags(void) logging(LOG_VERBOSE, "Test READ16 flags"); logging(LOG_VERBOSE, "Test READ16 with DPO==1"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 0, block_size, block_size, 0, 1, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -48,28 +48,28 @@ test_read16_flags(void) logging(LOG_VERBOSE, "Test READ16 with FUA==1 FUA_NV==0"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 0, block_size, block_size, 0, 0, 1, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ16 with FUA==1 FUA_NV==1"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 0, block_size, block_size, 0, 0, 1, 1, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ16 with FUA==0 FUA_NV==1"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 0, block_size, block_size, 0, 0, 0, 1, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test READ16 with DPO==1 FUA==1 FUA_NV==1"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 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_read16_rdprotect.c b/test-tool/test_read16_rdprotect.c index db81d79..e8ff73a 100644 --- a/test-tool/test_read16_rdprotect.c +++ b/test-tool/test_read16_rdprotect.c @@ -41,7 +41,7 @@ test_read16_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 = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 0, block_size, block_size, i, 0, 0, 0, 0, NULL, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_read16_simple.c b/test-tool/test_read16_simple.c index 413160d..bc77d93 100644 --- a/test-tool/test_read16_simple.c +++ b/test-tool/test_read16_simple.c @@ -39,7 +39,7 @@ test_read16_simple(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -57,7 +57,7 @@ test_read16_simple(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read16(sd, 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_read6_beyond_eol.c b/test-tool/test_read6_beyond_eol.c index db0f378..eecf32f 100644 --- a/test-tool/test_read6_beyond_eol.c +++ b/test-tool/test_read6_beyond_eol.c @@ -38,7 +38,7 @@ test_read6_beyond_eol(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ6 1-255 blocks one block beyond the end"); for (i = 1; i <= 255; i++) { - ret = read6(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = read6(sd, num_blocks + 1 - i, i * block_size, block_size, NULL, EXPECT_LBA_OOB); if (ret == -2) { @@ -52,7 +52,7 @@ test_read6_beyond_eol(void) logging(LOG_VERBOSE, "Test READ6 1-255 blocks at LBA==0x1fffff"); for (i = 1; i <= 255; i++) { - ret = read6(sd->iscsi_ctx, sd->iscsi_lun, 0x1fffff, + ret = read6(sd, 0x1fffff, i * block_size, block_size, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -61,7 +61,7 @@ test_read6_beyond_eol(void) logging(LOG_VERBOSE, "Test READ6 2-255 blocks all but one block beyond the end"); for (i = 2; i <= 255; i++) { - ret = read6(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = read6(sd, num_blocks - 1, i * block_size, block_size, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_read6_simple.c b/test-tool/test_read6_simple.c index 19c436d..f9d1d95 100644 --- a/test-tool/test_read6_simple.c +++ b/test-tool/test_read6_simple.c @@ -34,7 +34,7 @@ test_read6_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ6 of 1-255 blocks at the start of the LUN"); for (i = 1; i <= 255; i++) { - ret = read6(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read6(sd, 0, i * block_size, block_size, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -51,7 +51,7 @@ test_read6_simple(void) CU_PASS("LUN is too big for read-at-eol tests with READ6. Skipping test.\n"); } else { for (i = 1; i <= 255; i++) { - ret = read6(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read6(sd, num_blocks - i, i * block_size, block_size, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_readcapacity10_simple.c b/test-tool/test_readcapacity10_simple.c index 242f2db..ca53e10 100644 --- a/test-tool/test_readcapacity10_simple.c +++ b/test-tool/test_readcapacity10_simple.c @@ -34,7 +34,7 @@ test_readcapacity10_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test basic READCAPACITY10"); - ret = readcapacity10(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, + ret = readcapacity10(sd, 0, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_readcapacity16_alloclen.c b/test-tool/test_readcapacity16_alloclen.c index 0f8c089..92e73cc 100644 --- a/test-tool/test_readcapacity16_alloclen.c +++ b/test-tool/test_readcapacity16_alloclen.c @@ -35,7 +35,7 @@ test_readcapacity16_alloclen(void) logging(LOG_VERBOSE, "Test that READCAPACITY16 with alloc_len 0-15 is not an error"); for (i = 0; i < 16; i++) { - ret = readcapacity16(sd->iscsi_ctx, sd->iscsi_lun, i, + ret = readcapacity16(sd, i, EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] READCAPACITY16 is not implemented on this target and it does not claim SBC-3 support."); diff --git a/test-tool/test_readcapacity16_simple.c b/test-tool/test_readcapacity16_simple.c index 3b8e89f..21d58b4 100644 --- a/test-tool/test_readcapacity16_simple.c +++ b/test-tool/test_readcapacity16_simple.c @@ -34,7 +34,7 @@ test_readcapacity16_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that READCAPACITY16 works"); - ret = readcapacity16(sd->iscsi_ctx, sd->iscsi_lun, 16, + ret = readcapacity16(sd, 16, EXPECT_STATUS_GOOD); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] READCAPACITY16 is not implemented on this target and it does not claim support."); diff --git a/test-tool/test_readonly_sbc.c b/test-tool/test_readonly_sbc.c index 6625082..acfced1 100644 --- a/test-tool/test_readonly_sbc.c +++ b/test-tool/test_readonly_sbc.c @@ -41,25 +41,25 @@ test_readonly_sbc(void) logging(LOG_VERBOSE, "Test WRITE10 fails with WRITE_PROTECTED"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = write10(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE12 fails with WRITE_PROTECTED"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = write12(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE16 fails with WRITE_PROTECTED"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, block_size, + ret = write16(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE_SAME10 fails with WRITE_PROTECTED"); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, 1, + ret = writesame10(sd, 0, block_size, 1, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); if (ret == -2) { @@ -68,7 +68,7 @@ test_readonly_sbc(void) CU_ASSERT_NOT_EQUAL(ret, -1); logging(LOG_VERBOSE, "Test WRITE_SAME16 fails with WRITE_PROTECTED"); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, 1, + ret = writesame16(sd, 0, block_size, 1, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); if (ret == -2) { @@ -77,7 +77,7 @@ test_readonly_sbc(void) CU_ASSERT_NOT_EQUAL(ret, -1); logging(LOG_VERBOSE, "Test WRITE_SAME10 UNMAP fails with WRITE_PROTECTED"); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, 1, 0, 1, 0, 0, NULL, EXPECT_WRITE_PROTECTED); if (ret == -2) { @@ -86,7 +86,7 @@ test_readonly_sbc(void) CU_ASSERT_NOT_EQUAL(ret, -1); logging(LOG_VERBOSE, "Test WRITE_SAME16 UNMAP fails with WRITE_PROTECTED"); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, 1, 0, 1, 0, 0, NULL, EXPECT_WRITE_PROTECTED); if (ret == -2) { @@ -97,7 +97,7 @@ test_readonly_sbc(void) logging(LOG_VERBOSE, "Test UNMAP of one physical block fails with WRITE_PROTECTED"); list[0].lba = 0; list[0].num = lbppb; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_WRITE_PROTECTED); if (ret == -2) { logging(LOG_VERBOSE, "UNMAP not supported on target. Skipped."); @@ -107,7 +107,7 @@ test_readonly_sbc(void) logging(LOG_VERBOSE, "Test UNMAP of one logical block fails with WRITE_PROTECTED"); list[0].lba = 0; list[0].num = 1; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_WRITE_PROTECTED); if (ret == -2) { logging(LOG_VERBOSE, "UNMAP not supported on target. Skipped."); @@ -115,7 +115,7 @@ test_readonly_sbc(void) CU_ASSERT_NOT_EQUAL(ret, -1); logging(LOG_VERBOSE, "Test WRITEVERIFY10 fails with WRITE_PROTECTED"); - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify10(sd, 0, block_size, block_size, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); if (ret == -2) { @@ -124,7 +124,7 @@ test_readonly_sbc(void) CU_ASSERT_NOT_EQUAL(ret, -1); logging(LOG_VERBOSE, "Test WRITEVERIFY12 fails with WRITE_PROTECTED"); - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify12(sd, 0, block_size, block_size, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); if (ret == -2) { @@ -133,7 +133,7 @@ test_readonly_sbc(void) CU_ASSERT_NOT_EQUAL(ret, -1); logging(LOG_VERBOSE, "Test WRITEVERIFY16 fails with WRITE_PROTECTED"); - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify16(sd, 0, block_size, block_size, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); if (ret == -2) { @@ -142,7 +142,7 @@ test_readonly_sbc(void) CU_ASSERT_NOT_EQUAL(ret, -1); logging(LOG_VERBOSE, "Test ORWRITE fails with WRITE_PROTECTED"); - ret = orwrite(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = orwrite(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_WRITE_PROTECTED); if (ret == -2) { diff --git a/test-tool/test_report_supported_opcodes_one_command.c b/test-tool/test_report_supported_opcodes_one_command.c index c629602..a8001c8 100644 --- a/test-tool/test_report_supported_opcodes_one_command.c +++ b/test-tool/test_report_supported_opcodes_one_command.c @@ -39,7 +39,7 @@ test_report_supported_opcodes_one_command(void) logging(LOG_VERBOSE, "Fetch list of all supported opcodes"); - ret = report_supported_opcodes(sd->iscsi_ctx, &rso_task, sd->iscsi_lun, + ret = report_supported_opcodes(sd, &rso_task, 0, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0, 65535, EXPECT_STATUS_GOOD); @@ -68,7 +68,7 @@ test_report_supported_opcodes_one_command(void) if (rsoc->descriptors[i].servactv) { logging(LOG_VERBOSE, "This opcode has service actions. " "Reporting Options 001b should fail"); - ret = report_supported_opcodes(sd->iscsi_ctx, NULL, sd->iscsi_lun, + ret = report_supported_opcodes(sd, NULL, 0, SCSI_REPORT_SUPPORTING_OPCODE, rsoc->descriptors[i].opcode, rsoc->descriptors[i].sa, @@ -79,7 +79,7 @@ test_report_supported_opcodes_one_command(void) "service actions. Reporting Options 001b " "should work"); ret = report_supported_opcodes( - sd->iscsi_ctx, NULL, sd->iscsi_lun, + sd, NULL, 0, SCSI_REPORT_SUPPORTING_OPCODE, rsoc->descriptors[i].opcode, rsoc->descriptors[i].sa, @@ -92,7 +92,7 @@ test_report_supported_opcodes_one_command(void) logging(LOG_VERBOSE, "This opcode has service actions. " "Reporting Options 002b should work"); ret = report_supported_opcodes( - sd->iscsi_ctx, NULL, sd->iscsi_lun, + sd, NULL, 0, SCSI_REPORT_SUPPORTING_SERVICEACTION, rsoc->descriptors[i].opcode, rsoc->descriptors[i].sa, @@ -103,7 +103,7 @@ test_report_supported_opcodes_one_command(void) "service actions. Reporting Options 002b " "should fail"); ret = report_supported_opcodes( - sd->iscsi_ctx, NULL, sd->iscsi_lun, + sd, NULL, 0, SCSI_REPORT_SUPPORTING_SERVICEACTION, rsoc->descriptors[i].opcode, rsoc->descriptors[i].sa, @@ -121,8 +121,7 @@ test_report_supported_opcodes_one_command(void) rsoc->descriptors[i].opcode, rsoc->descriptors[i].sa); ret = report_supported_opcodes( - sd->iscsi_ctx, &one_task, sd->iscsi_lun, - 0, + sd, &one_task, 0, rsoc->descriptors[i].servactv ? SCSI_REPORT_SUPPORTING_SERVICEACTION : SCSI_REPORT_SUPPORTING_OPCODE, diff --git a/test-tool/test_report_supported_opcodes_rctd.c b/test-tool/test_report_supported_opcodes_rctd.c index 48d494b..011820a 100644 --- a/test-tool/test_report_supported_opcodes_rctd.c +++ b/test-tool/test_report_supported_opcodes_rctd.c @@ -39,7 +39,7 @@ test_report_supported_opcodes_rctd(void) logging(LOG_VERBOSE, "Test READ_SUPPORTED_OPCODES report ALL opcodes " "without timeout descriptors"); ret = report_supported_opcodes( - sd->iscsi_ctx, &rso_task, sd->iscsi_lun, + sd, &rso_task, 0, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0, 65535, EXPECT_STATUS_GOOD); @@ -76,7 +76,7 @@ test_report_supported_opcodes_rctd(void) logging(LOG_VERBOSE, "Test READ_SUPPORTED_OPCODES report ALL opcodes " "with timeout descriptors"); ret = report_supported_opcodes( - sd->iscsi_ctx, &rso_task, sd->iscsi_lun, + sd, &rso_task, 1, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0, 65535, EXPECT_STATUS_GOOD); diff --git a/test-tool/test_report_supported_opcodes_servactv.c b/test-tool/test_report_supported_opcodes_servactv.c index a9867b9..56a6662 100644 --- a/test-tool/test_report_supported_opcodes_servactv.c +++ b/test-tool/test_report_supported_opcodes_servactv.c @@ -37,7 +37,7 @@ test_report_supported_opcodes_servactv(void) ret = report_supported_opcodes( - sd->iscsi_ctx, &rso_task, sd->iscsi_lun, + sd, &rso_task, 0, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0, 65535, EXPECT_STATUS_GOOD); diff --git a/test-tool/test_report_supported_opcodes_simple.c b/test-tool/test_report_supported_opcodes_simple.c index 2ce84df..b893833 100644 --- a/test-tool/test_report_supported_opcodes_simple.c +++ b/test-tool/test_report_supported_opcodes_simple.c @@ -34,7 +34,7 @@ test_report_supported_opcodes_simple(void) logging(LOG_VERBOSE, "Test basic READ_SUPPORTED_OPCODES"); ret = report_supported_opcodes( - sd->iscsi_ctx, NULL, sd->iscsi_lun, + sd, NULL, 0, SCSI_REPORT_SUPPORTING_OPS_ALL, 0, 0, 1024, EXPECT_STATUS_GOOD); diff --git a/test-tool/test_reserve6_2initiators.c b/test-tool/test_reserve6_2initiators.c index eb0950c..54ed817 100644 --- a/test-tool/test_reserve6_2initiators.c +++ b/test-tool/test_reserve6_2initiators.c @@ -29,14 +29,14 @@ void test_reserve6_2initiators(void) { int ret; - + struct scsi_device sd2; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test RESERVE6/RELEASE6 across two initiators"); logging(LOG_NORMAL, "Take out a RESERVE6 from the first initiator"); - ret = reserve6(sd->iscsi_ctx, sd->iscsi_lun); + ret = reserve6(sd); if (ret == -2) { logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test"); CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test"); @@ -46,53 +46,53 @@ test_reserve6_2initiators(void) logging(LOG_NORMAL, "Verify that the first initiator can re-RESERVE6 the same reservation"); - ret = reserve6(sd->iscsi_ctx, sd->iscsi_lun); + ret = reserve6(sd); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd2.iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_NORMAL, "Try to take out a RESERVE6 from the second initiator"); - ret = reserve6_conflict(iscsic2, sd->iscsi_lun); + ret = reserve6_conflict(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL, "Try to RELEASE from the second initiator. Should be a nop"); - ret = release6(iscsic2, sd->iscsi_lun); + ret = release6(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL, "Test we can still send MODE SENSE from the first initiator"); - ret = mode_sense(sd->iscsi_ctx, sd->iscsi_lun); + ret = mode_sense(sd); CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL, "MODE SENSE should fail from the second initiator"); - ret = mode_sense(iscsic2, sd->iscsi_lun); + ret = mode_sense(&sd2); CU_ASSERT_EQUAL(ret, SCSI_STATUS_RESERVATION_CONFLICT); logging(LOG_NORMAL, "RESERVE6 from the second initiator should still fail"); - ret = reserve6_conflict(iscsic2, sd->iscsi_lun); + ret = reserve6_conflict(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL, "RELEASE6 from the first initiator"); - ret = release6(sd->iscsi_ctx, sd->iscsi_lun); + ret = release6(sd); CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL, "RESERVE6 from the second initiator should work now"); - ret = reserve6(iscsic2, sd->iscsi_lun); + ret = reserve6(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL, "RELEASE6 from the second initiator"); - ret = release6(iscsic2, sd->iscsi_lun); + ret = release6(&sd2); CU_ASSERT_EQUAL(ret, 0); - iscsi_logout_sync(iscsic2); - iscsi_destroy_context(iscsic2); + iscsi_logout_sync(sd2.iscsi_ctx); + iscsi_destroy_context(sd2.iscsi_ctx); iscsic2 = NULL; } diff --git a/test-tool/test_reserve6_itnexus_loss.c b/test-tool/test_reserve6_itnexus_loss.c index 88f1fde..369d3e1 100644 --- a/test-tool/test_reserve6_itnexus_loss.c +++ b/test-tool/test_reserve6_itnexus_loss.c @@ -29,14 +29,14 @@ void test_reserve6_itnexus_loss(void) { int ret; - + struct scsi_device sd2; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that RESERVE6 is released on it-nexus loss"); logging(LOG_NORMAL, "Take out a RESERVE6 from the first initiator"); - ret = reserve6(sd->iscsi_ctx, sd->iscsi_lun); + ret = reserve6(sd); if (ret == -2) { logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test"); CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test"); @@ -46,14 +46,14 @@ test_reserve6_itnexus_loss(void) logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd2.iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_NORMAL, "Try to take out a RESERVE6 from the second initiator"); - ret = reserve6_conflict(iscsic2, sd->iscsi_lun); + ret = reserve6_conflict(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Disconnect from the target."); @@ -70,15 +70,15 @@ test_reserve6_itnexus_loss(void) } logging(LOG_NORMAL, "RESERVE6 from the second initiator should work now"); - ret = reserve6(iscsic2, sd->iscsi_lun); + ret = reserve6(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL, "RELEASE6 from the second initiator"); - ret = release6(iscsic2, sd->iscsi_lun); + ret = release6(&sd2); CU_ASSERT_EQUAL(ret, 0); finished: - iscsi_logout_sync(iscsic2); - iscsi_destroy_context(iscsic2); + iscsi_logout_sync(sd2.iscsi_ctx); + iscsi_destroy_context(sd2.iscsi_ctx); iscsic2 = NULL; } diff --git a/test-tool/test_reserve6_logout.c b/test-tool/test_reserve6_logout.c index 75a7818..85193f1 100644 --- a/test-tool/test_reserve6_logout.c +++ b/test-tool/test_reserve6_logout.c @@ -29,14 +29,14 @@ void test_reserve6_logout(void) { int ret; - + struct scsi_device sd2; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that RESERVE6 is released on logout"); logging(LOG_NORMAL, "Take out a RESERVE6 from the first initiator"); - ret = reserve6(sd->iscsi_ctx, sd->iscsi_lun); + ret = reserve6(sd); if (ret == -2) { logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test"); CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test"); @@ -46,14 +46,14 @@ test_reserve6_logout(void) logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd2.iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_NORMAL, "Try to take out a RESERVE6 from the second initiator"); - ret = reserve6_conflict(iscsic2, sd->iscsi_lun); + ret = reserve6_conflict(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Logout from target"); @@ -68,14 +68,13 @@ test_reserve6_logout(void) } logging(LOG_NORMAL, "RESERVE6 from the second initiator should work now"); - ret = reserve6(iscsic2, sd->iscsi_lun); + ret = reserve6(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_NORMAL, "RELEASE6 from the second initiator"); - ret = release6(iscsic2, sd->iscsi_lun); + ret = release6(&sd2); CU_ASSERT_EQUAL(ret, 0); - iscsi_logout_sync(iscsic2); - iscsi_destroy_context(iscsic2); - iscsic2 = NULL; + iscsi_logout_sync(sd2.iscsi_ctx); + iscsi_destroy_context(sd2.iscsi_ctx); } diff --git a/test-tool/test_reserve6_lun_reset.c b/test-tool/test_reserve6_lun_reset.c index 49a8404..110d710 100644 --- a/test-tool/test_reserve6_lun_reset.c +++ b/test-tool/test_reserve6_lun_reset.c @@ -29,14 +29,14 @@ void test_reserve6_lun_reset(void) { int ret; - + struct scsi_device sd2; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that RESERVE6 is released on lun reset"); logging(LOG_VERBOSE, "Take out a RESERVE6 from the first initiator"); - ret = reserve6(sd->iscsi_ctx, sd->iscsi_lun); + ret = reserve6(sd); if (ret == -2) { logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test"); CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test"); @@ -57,21 +57,20 @@ test_reserve6_lun_reset(void) logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd2.iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_VERBOSE, "RESERVE6 from the second initiator should work now"); - ret = reserve6(iscsic2, sd->iscsi_lun); + ret = reserve6(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "RELEASE6 from the second initiator"); - ret = release6(iscsic2, sd->iscsi_lun); + ret = release6(&sd2); CU_ASSERT_EQUAL(ret, 0); - iscsi_logout_sync(iscsic2); - iscsi_destroy_context(iscsic2); - iscsic2 = NULL; + iscsi_logout_sync(sd2.iscsi_ctx); + iscsi_destroy_context(sd2.iscsi_ctx); } diff --git a/test-tool/test_reserve6_simple.c b/test-tool/test_reserve6_simple.c index 267150e..03d22f5 100644 --- a/test-tool/test_reserve6_simple.c +++ b/test-tool/test_reserve6_simple.c @@ -34,7 +34,7 @@ test_reserve6_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test basic RESERVE6/RELEASE6 commands if supported"); - ret = reserve6(sd->iscsi_ctx, sd->iscsi_lun); + ret = reserve6(sd); if (ret == -2) { logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test"); CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test"); @@ -42,6 +42,6 @@ test_reserve6_simple(void) } CU_ASSERT_EQUAL(ret, 0); - ret = release6(sd->iscsi_ctx, sd->iscsi_lun); + ret = release6(sd); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_reserve6_target_cold_reset.c b/test-tool/test_reserve6_target_cold_reset.c index d6d3b05..8a76ef7 100644 --- a/test-tool/test_reserve6_target_cold_reset.c +++ b/test-tool/test_reserve6_target_cold_reset.c @@ -29,14 +29,14 @@ void test_reserve6_target_cold_reset(void) { int ret; - + struct scsi_device sd2; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that RESERVE6 is released on target cold reset"); logging(LOG_VERBOSE, "Take out a RESERVE6 from the first initiator"); - ret = reserve6(sd->iscsi_ctx, sd->iscsi_lun); + ret = reserve6(sd); if (ret == -2) { logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test"); CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test"); @@ -56,21 +56,20 @@ test_reserve6_target_cold_reset(void) sleep(3); logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd2.iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_VERBOSE, "RESERVE6 from the second initiator should work now"); - ret = reserve6(iscsic2, sd->iscsi_lun); + ret = reserve6(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "RELEASE6 from the second initiator"); - ret = release6(iscsic2, sd->iscsi_lun); + ret = release6(&sd2); CU_ASSERT_EQUAL(ret, 0); - iscsi_logout_sync(iscsic2); - iscsi_destroy_context(iscsic2); - iscsic2 = NULL; + iscsi_logout_sync(sd2.iscsi_ctx); + iscsi_destroy_context(sd2.iscsi_ctx); } diff --git a/test-tool/test_reserve6_target_warm_reset.c b/test-tool/test_reserve6_target_warm_reset.c index 0ec0141..078d393 100644 --- a/test-tool/test_reserve6_target_warm_reset.c +++ b/test-tool/test_reserve6_target_warm_reset.c @@ -29,14 +29,14 @@ void test_reserve6_target_warm_reset(void) { int ret; - + struct scsi_device sd2; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that RESERVE6 is released on target warm reset"); logging(LOG_VERBOSE, "Take out a RESERVE6 from the first initiator"); - ret = reserve6(sd->iscsi_ctx, sd->iscsi_lun); + ret = reserve6(sd); if (ret == -2) { logging(LOG_VERBOSE, "[SKIPPED] Target does not support RESERVE6. Skipping test"); CU_PASS("[SKIPPED] Target does not support RESERVE6. Skipping test"); @@ -57,22 +57,21 @@ test_reserve6_target_warm_reset(void) logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd2.iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_VERBOSE, "RESERVE6 from the second initiator should work now"); - ret = reserve6(iscsic2, sd->iscsi_lun); + ret = reserve6(&sd2); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "RELEASE6 from the second initiator"); - ret = release6(iscsic2, sd->iscsi_lun); + ret = release6(&sd2); CU_ASSERT_EQUAL(ret, 0); - iscsi_logout_sync(iscsic2); - iscsi_destroy_context(iscsic2); - iscsic2 = NULL; + iscsi_logout_sync(sd2.iscsi_ctx); + iscsi_destroy_context(sd2.iscsi_ctx); } diff --git a/test-tool/test_sanitize_block_erase.c b/test-tool/test_sanitize_block_erase.c index e4c7ec1..1cb6d77 100644 --- a/test-tool/test_sanitize_block_erase.c +++ b/test-tool/test_sanitize_block_erase.c @@ -33,7 +33,7 @@ check_wabereq(void) struct scsi_task *task_ret = NULL; logging(LOG_VERBOSE, "Read one block from LBA 0"); - read10(sd->iscsi_ctx, &task_ret, sd->iscsi_lun, 0, block_size, block_size, + read10(sd, &task_ret, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_PTR_NOT_NULL(task_ret); @@ -109,7 +109,7 @@ check_unmap(void) uint64_t lba; logging(LOG_VERBOSE, "Read LBA mapping from the target"); - get_lba_status(sd->iscsi_ctx, &task_ret, sd->iscsi_lun, 0, 256, + get_lba_status(sd, &task_ret, 0, 256, EXPECT_STATUS_GOOD); if (task_ret == NULL) { logging(LOG_VERBOSE, "[FAILED] Failed to read LBA mapping " @@ -197,7 +197,7 @@ init_lun_with_data(unsigned char *buf, uint64_t lba) int ret; memset(buf, 'a', 256 * block_size); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, lba, 256 * block_size, + ret = write16(sd, lba, 256 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -209,7 +209,7 @@ check_lun_is_wiped(unsigned char *buf, uint64_t lba) int ret; unsigned char *rbuf = alloca(256 * block_size); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, lba, 256 * block_size, + ret = read16(sd, lba, 256 * block_size, block_size, 0, 0, 0, 0, 0, rbuf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -325,7 +325,7 @@ test_sanitize_block_erase(void) logging(LOG_VERBOSE, "Test we can perform basic BLOCK ERASE SANITIZE"); - ret = sanitize(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 0, NULL); CU_ASSERT_EQUAL(ret, 0); @@ -341,7 +341,7 @@ test_sanitize_block_erase(void) logging(LOG_VERBOSE, "BLOCK_ERASE parameter list length must be 0"); logging(LOG_VERBOSE, "Test that non-zero param length is an error for " "BLOCK ERASE"); - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 8, &data); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_sanitize_block_erase_reserved.c b/test-tool/test_sanitize_block_erase_reserved.c index 2c721ed..fa95933 100644 --- a/test-tool/test_sanitize_block_erase_reserved.c +++ b/test-tool/test_sanitize_block_erase_reserved.c @@ -63,7 +63,7 @@ void test_sanitize_block_erase_reserved(void) logging(LOG_VERBOSE, "Send SANITIZE command with the reserved " "bit in byte 1 set to 1"); change_num = 1; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 0, NULL); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] SANITIZE BLOCK_ERASE is not " @@ -79,7 +79,7 @@ void test_sanitize_block_erase_reserved(void) "byte %d set to non-zero", i); change_num = i; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 0, NULL); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_sanitize_crypto_erase.c b/test-tool/test_sanitize_crypto_erase.c index 27856b3..7170199 100644 --- a/test-tool/test_sanitize_crypto_erase.c +++ b/test-tool/test_sanitize_crypto_erase.c @@ -33,7 +33,7 @@ check_wacereq(void) struct scsi_task *task_ret = NULL; logging(LOG_VERBOSE, "Read one block from LBA 0"); - read10(sd->iscsi_ctx, &task_ret, sd->iscsi_lun, 0, block_size, block_size, + read10(sd, &task_ret, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); CU_ASSERT_PTR_NOT_NULL(task_ret); @@ -106,7 +106,7 @@ init_lun_with_data(unsigned char *buf, uint64_t lba) int ret; memset(buf, 'a', 256 * block_size); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, lba, 256 * block_size, + ret = write16(sd, lba, 256 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -118,7 +118,7 @@ check_lun_is_wiped(unsigned char *buf, uint64_t lba) int ret; unsigned char *rbuf = alloca(256 * block_size); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, lba, 256 * block_size, + ret = read16(sd, lba, 256 * block_size, block_size, 0, 0, 0, 0, 0, rbuf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -184,7 +184,7 @@ test_sanitize_crypto_erase(void) logging(LOG_VERBOSE, "Test we can perform basic CRYPTO ERASE SANITIZE"); - ret = sanitize(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize(sd, 0, 0, SCSI_SANITIZE_CRYPTO_ERASE, 0, NULL); CU_ASSERT_EQUAL(ret, 0); @@ -202,7 +202,7 @@ return; logging(LOG_VERBOSE, "CRYPTO_ERASE parameter list length must be 0"); logging(LOG_VERBOSE, "Test that non-zero param length is an error for " "CRYPTO ERASE"); - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_CRYPTO_ERASE, 8, &data); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_sanitize_crypto_erase_reserved.c b/test-tool/test_sanitize_crypto_erase_reserved.c index e142305..ea18e97 100644 --- a/test-tool/test_sanitize_crypto_erase_reserved.c +++ b/test-tool/test_sanitize_crypto_erase_reserved.c @@ -63,7 +63,7 @@ void test_sanitize_crypto_erase_reserved(void) logging(LOG_VERBOSE, "Send SANITIZE command with the reserved " "bit in byte 1 set to 1"); change_num = 1; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_CRYPTO_ERASE, 0, NULL); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] SANITIZE CRYPTO_ERASE is not " @@ -79,7 +79,7 @@ void test_sanitize_crypto_erase_reserved(void) "byte %d set to non-zero", i); change_num = i; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_CRYPTO_ERASE, 0, NULL); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_sanitize_exit_failure_mode.c b/test-tool/test_sanitize_exit_failure_mode.c index 40063ed..a056364 100644 --- a/test-tool/test_sanitize_exit_failure_mode.c +++ b/test-tool/test_sanitize_exit_failure_mode.c @@ -60,7 +60,7 @@ test_sanitize_exit_failure_mode(void) "be 0"); logging(LOG_VERBOSE, "Test that non-zero param length is an error for " "EXIT_FAILURE_MODE"); - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_EXIT_FAILURE_MODE, 8, &data); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_sanitize_invalid_serviceaction.c b/test-tool/test_sanitize_invalid_serviceaction.c index 1c77037..e40c8e1 100644 --- a/test-tool/test_sanitize_invalid_serviceaction.c +++ b/test-tool/test_sanitize_invalid_serviceaction.c @@ -51,7 +51,7 @@ test_sanitize_invalid_serviceaction(void) logging(LOG_VERBOSE, "Verify that ServiceAction:0x%02d is " "an error.", i); - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, i, 0, NULL); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] SANITIZE is not " diff --git a/test-tool/test_sanitize_overwrite.c b/test-tool/test_sanitize_overwrite.c index 0fa7b52..5a908ab 100644 --- a/test-tool/test_sanitize_overwrite.c +++ b/test-tool/test_sanitize_overwrite.c @@ -33,7 +33,7 @@ init_lun_with_data(uint64_t lba) unsigned char *buf = alloca(256 * block_size); memset(buf, 'a', 256 * block_size); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, lba, 256 * block_size, + ret = write16(sd, lba, 256 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -46,7 +46,7 @@ check_lun_is_wiped(uint64_t lba, char c) unsigned char *rbuf = alloca(256 * block_size); unsigned char *zbuf = alloca(256 * block_size); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, lba, 256 * block_size, + ret = read16(sd, lba, 256 * block_size, block_size, 0, 0, 0, 0, 0, rbuf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -124,7 +124,7 @@ test_sanitize_overwrite(void) data.data[1] = 0x00; data.data[2] = block_size >> 8; data.data[3] = block_size & 0xff; - ret = sanitize(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); @@ -140,7 +140,7 @@ test_sanitize_overwrite(void) data.data[2] = (block_size / 2) >> 8; data.data[3] = (block_size / 2 ) & 0xff; - ret = sanitize(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); @@ -151,7 +151,7 @@ test_sanitize_overwrite(void) data.data[2] = 0; data.data[3] = 4; - ret = sanitize(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); @@ -161,7 +161,7 @@ test_sanitize_overwrite(void) logging(LOG_VERBOSE, "Test OVERWRITE with ParamLen:%d is an " "error.", i); - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, i, &data); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] SANITIZE is not " @@ -180,7 +180,7 @@ test_sanitize_overwrite(void) data.size = block_size + 8; data.data = alloca(block_size + 8); /* so we can send IP > blocksize */ memset(data.data, 0, data.size); - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, block_size + 5, &data); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] SANITIZE is not " @@ -199,7 +199,7 @@ test_sanitize_overwrite(void) data.data[1] = 0x00; data.data[2] = block_size >> 8; data.data[3] = block_size & 0xff; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); @@ -212,7 +212,7 @@ test_sanitize_overwrite(void) data.data[1] = 0x00; data.data[2] = 0x00; data.data[3] = 0x00; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); @@ -226,7 +226,7 @@ test_sanitize_overwrite(void) data.data[1] = 0x00; data.data[2] = (block_size + 4) >> 8; data.data[3] = (block_size + 4) & 0xff; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_sanitize_overwrite_reserved.c b/test-tool/test_sanitize_overwrite_reserved.c index 94fef3c..50dc69c 100644 --- a/test-tool/test_sanitize_overwrite_reserved.c +++ b/test-tool/test_sanitize_overwrite_reserved.c @@ -73,7 +73,7 @@ void test_sanitize_overwrite_reserved(void) logging(LOG_VERBOSE, "Send SANITIZE command with the reserved " "bit in byte 1 set to 1"); change_num = 1; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); if (ret == -2) { logging(LOG_NORMAL, "[SKIPPED] SANITIZE OVERWRITE is not " @@ -89,7 +89,7 @@ void test_sanitize_overwrite_reserved(void) "byte %d set to non-zero", i); change_num = i; - ret = sanitize_invalidfieldincdb(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_invalidfieldincdb(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_sanitize_readonly.c b/test-tool/test_sanitize_readonly.c index 89f8c8c..7d52ece 100644 --- a/test-tool/test_sanitize_readonly.c +++ b/test-tool/test_sanitize_readonly.c @@ -32,6 +32,7 @@ test_sanitize_readonly(void) int ret; struct iscsi_data data; struct scsi_command_descriptor *cd; + struct scsi_device sd2; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test SANITIZE with READONLY devices"); @@ -40,14 +41,14 @@ test_sanitize_readonly(void) CHECK_FOR_DATALOSS; logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd2.iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_VERBOSE, "Set Software Write Protect on the second connection"); - ret = set_swp(iscsic2, sd->iscsi_lun); + ret = set_swp(&sd2); CU_ASSERT_EQUAL(ret, 0); if (ret != 0) { return; @@ -55,7 +56,7 @@ test_sanitize_readonly(void) logging(LOG_VERBOSE, "Use TESTUNITREADY to clear unit attention on " "first connection"); - while (testunitready_clear_ua(sd->iscsi_ctx, sd->iscsi_lun)) { + while (testunitready_clear_ua(sd)) { sleep(1); } @@ -77,7 +78,7 @@ test_sanitize_readonly(void) data.data[1] = 0x00; data.data[2] = block_size >> 8; data.data[3] = block_size & 0xff; - ret = sanitize_writeprotected(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_writeprotected(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); } @@ -92,7 +93,7 @@ test_sanitize_readonly(void) "implemented according to REPORT_SUPPORTED_OPCODES."); } else { logging(LOG_VERBOSE, "Test SANITIZE BLOCK_ERASE"); - ret = sanitize_writeprotected(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_writeprotected(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 0, NULL); CU_ASSERT_EQUAL(ret, 0); } @@ -106,21 +107,20 @@ test_sanitize_readonly(void) "implemented according to REPORT_SUPPORTED_OPCODES."); } else { logging(LOG_VERBOSE, "Test SANITIZE CRYPTO_ERASE"); - ret = sanitize_writeprotected(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_writeprotected(sd, 0, 0, SCSI_SANITIZE_CRYPTO_ERASE, 0, NULL); CU_ASSERT_EQUAL(ret, 0); } logging(LOG_VERBOSE, "Clear Software Write Protect on the second connection"); - ret = clear_swp(iscsic2, sd->iscsi_lun); + ret = clear_swp(&sd2); logging(LOG_VERBOSE, "Use TESTUNITREADY to clear unit attention on " "first connection"); - while (testunitready_clear_ua(sd->iscsi_ctx, sd->iscsi_lun)) { + while (testunitready_clear_ua(sd)) { sleep(1); } - iscsi_destroy_context(iscsic2); - iscsic2 = NULL; + iscsi_destroy_context(sd2.iscsi_ctx); } diff --git a/test-tool/test_sanitize_reservations.c b/test-tool/test_sanitize_reservations.c index b3509c8..262dd65 100644 --- a/test-tool/test_sanitize_reservations.c +++ b/test-tool/test_sanitize_reservations.c @@ -32,6 +32,7 @@ test_sanitize_reservations(void) int ret; struct iscsi_data data; struct scsi_command_descriptor *cd; + struct scsi_device sd2; logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test SANITIZE with RESERVATIONS"); @@ -40,15 +41,15 @@ test_sanitize_reservations(void) CHECK_FOR_DATALOSS; logging(LOG_VERBOSE, "Create a second connection to the target"); - iscsic2 = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd->iscsi_lun); - if (iscsic2 == NULL) { + sd2.iscsi_ctx = iscsi_context_login(initiatorname2, sd->iscsi_url, &sd2.iscsi_lun); + if (sd2.iscsi_ctx == NULL) { logging(LOG_VERBOSE, "Failed to login to target"); return; } logging(LOG_VERBOSE, "Take out a RESERVE6 from the second " "initiator"); - ret = reserve6(iscsic2, sd->iscsi_lun); + ret = reserve6(&sd2); CU_ASSERT_EQUAL(ret, 0); @@ -70,7 +71,7 @@ test_sanitize_reservations(void) data.data[1] = 0x00; data.data[2] = block_size >> 8; data.data[3] = block_size & 0xff; - ret = sanitize_conflict(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_conflict(sd, 0, 0, SCSI_SANITIZE_OVERWRITE, data.size, &data); CU_ASSERT_EQUAL(ret, 0); } @@ -85,7 +86,7 @@ test_sanitize_reservations(void) "implemented according to REPORT_SUPPORTED_OPCODES."); } else { logging(LOG_VERBOSE, "Test SANITIZE BLOCK_ERASE"); - ret = sanitize_conflict(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_conflict(sd, 0, 0, SCSI_SANITIZE_BLOCK_ERASE, 0, NULL); CU_ASSERT_EQUAL(ret, 0); } @@ -99,12 +100,10 @@ test_sanitize_reservations(void) "implemented according to REPORT_SUPPORTED_OPCODES."); } else { logging(LOG_VERBOSE, "Test SANITIZE CRYPTO_ERASE"); - ret = sanitize_conflict(sd->iscsi_ctx, sd->iscsi_lun, + ret = sanitize_conflict(sd, 0, 0, SCSI_SANITIZE_CRYPTO_ERASE, 0, NULL); CU_ASSERT_EQUAL(ret, 0); } - - iscsi_destroy_context(iscsic2); - iscsic2 = NULL; + iscsi_destroy_context(sd2.iscsi_ctx); } diff --git a/test-tool/test_sanitize_reset.c b/test-tool/test_sanitize_reset.c index f92b864..f2bd11b 100644 --- a/test-tool/test_sanitize_reset.c +++ b/test-tool/test_sanitize_reset.c @@ -86,26 +86,26 @@ test_sanitize_reset(void) logging(LOG_VERBOSE, "Verify that the SANITIZE has started and that " "TESTUNITREADY fails with SANITIZE_IN_PROGRESS"); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify that STARTSTOPUNIT fails with " "SANITIZE_IN_PROGRESS"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 1, 0, 1, 0, 1, 0, + ret = startstopunit(sd, 1, 0, 1, 0, 1, 0, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify that READ16 fails with " "SANITIZE_IN_PROGRESS"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = read16(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify that INQUIRY is still allowed while " "SANITIZE is in progress"); - ret = inquiry(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 0, 255, + ret = inquiry(sd, NULL, 0, 0, 255, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -157,12 +157,12 @@ test_sanitize_reset(void) } logging(LOG_VERBOSE, "Verify that the SANITIZE is still going."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Wait until the SANITIZE operation has finished"); - while (testunitready_clear_ua(sd->iscsi_ctx, sd->iscsi_lun)) { + while (testunitready_clear_ua(sd)) { sleep(60); } } diff --git a/test-tool/test_startstopunit_noloej.c b/test-tool/test_startstopunit_noloej.c index e311aee..8005658 100644 --- a/test-tool/test_startstopunit_noloej.c +++ b/test-tool/test_startstopunit_noloej.c @@ -39,95 +39,95 @@ test_startstopunit_noloej(void) } logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==0 START==0"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 0, 0, 0, 0, 0, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==0 START==1"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 0, 0, 0, 0, 0, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==0 START==0"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 1, 0, 0, 0, 0, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==0 START==1"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 1, 0, 0, 0, 0, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==1 START==0"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 0, 0, 0, 1, 0, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==0 NO_FLUSH==1 START==1"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 0, 0, 0, 1, 0, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==1 START==0"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 1, 0, 0, 1, 0, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test that media is not ejected when LOEJ==0 IMMED==1 NO_FLUSH==1 START==1"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 1, 0, 0, 1, 0, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "In case the target did eject the medium, load it again."); - startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 1, 0, 0, 0, 1, 1, + startstopunit(sd, 1, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); } diff --git a/test-tool/test_startstopunit_pwrcnd.c b/test-tool/test_startstopunit_pwrcnd.c index c902591..48b6574 100644 --- a/test-tool/test_startstopunit_pwrcnd.c +++ b/test-tool/test_startstopunit_pwrcnd.c @@ -40,18 +40,18 @@ test_startstopunit_pwrcnd(void) logging(LOG_VERBOSE, "Test that media is not ejected when PC!=0"); for (i = 1; i < 16; i++) { - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 1, 0, i, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is not ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); } logging(LOG_VERBOSE, "In case the target did eject the medium, load it again."); - startstopunit(sd->iscsi_ctx, sd->iscsi_lun, 1, 0, 0, 0, 1, 1, + startstopunit(sd, 1, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); } diff --git a/test-tool/test_startstopunit_simple.c b/test-tool/test_startstopunit_simple.c index dd0f90a..951fa83 100644 --- a/test-tool/test_startstopunit_simple.c +++ b/test-tool/test_startstopunit_simple.c @@ -41,7 +41,7 @@ test_startstopunit_simple(void) logging(LOG_VERBOSE, "Media is not removable. STARTSTOPUNIT should fail"); } - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 1, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); if (!inq->rmb) { @@ -52,45 +52,45 @@ test_startstopunit_simple(void) logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test we can load the removable the media with IMMED==1"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 1, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can read from the media."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test we can eject removable the media with IMMED==1"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test TESTUNITREADY that medium is ejected."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_NO_MEDIUM); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test we can load the removable the media with IMMED==1"); - ret = startstopunit(sd->iscsi_ctx, sd->iscsi_lun, + ret = startstopunit(sd, 0, 0, 0, 0, 1, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Verify we can access the media again."); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_SANITIZE); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_testunitready_simple.c b/test-tool/test_testunitready_simple.c index 7624d54..e56b49d 100644 --- a/test-tool/test_testunitready_simple.c +++ b/test-tool/test_testunitready_simple.c @@ -30,7 +30,7 @@ test_testunitready_simple(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test TESTUNITREADY"); - ret = testunitready(sd->iscsi_ctx, sd->iscsi_lun, + ret = testunitready(sd, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } diff --git a/test-tool/test_unmap_0blocks.c b/test-tool/test_unmap_0blocks.c index dddee15..063b798 100644 --- a/test-tool/test_unmap_0blocks.c +++ b/test-tool/test_unmap_0blocks.c @@ -40,7 +40,7 @@ test_unmap_0blocks(void) for (i = 0; i < 256; i++) { list[0].lba = i; list[0].num = 0; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } @@ -49,7 +49,7 @@ test_unmap_0blocks(void) for (i = 0; i < 256; i++) { list[i].lba = i; list[i].num = 0; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, i, + ret = unmap(sd, 0, list, i, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); } @@ -57,7 +57,7 @@ test_unmap_0blocks(void) logging(LOG_VERBOSE, "Test UNMAP of 0 blocks at end-of-LUN"); list[0].lba = num_blocks; list[0].num = 0; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -67,13 +67,13 @@ test_unmap_0blocks(void) list[i].lba = i/2; list[i].num = 0; } - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 256, + ret = unmap(sd, 0, list, 256, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test UNMAP without any descriptors."); - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 0, + ret = unmap(sd, 0, list, 0, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_unmap_simple.c b/test-tool/test_unmap_simple.c index c21b88e..6e6f0fd 100644 --- a/test-tool/test_unmap_simple.c +++ b/test-tool/test_unmap_simple.c @@ -31,7 +31,7 @@ init_lun_with_data(unsigned char *buf, uint64_t lba) int ret; memset(buf, 'a', 256 * block_size); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, lba, 256 * block_size, + ret = write10(sd, lba, 256 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -64,12 +64,12 @@ test_unmap_simple(void) logging(LOG_VERBOSE, "UNMAP blocks 0-%d", i); list[0].lba = 0; list[0].num = i; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read blocks 0-%d", i); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -99,12 +99,12 @@ test_unmap_simple(void) for (i = 0; i < 256; i++) { list[i].lba = i; list[i].num = 1; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, i + 1, + ret = unmap(sd, 0, list, i + 1, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Read blocks 0-%d", i); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 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_unmap_vpd.c b/test-tool/test_unmap_vpd.c index 4f11a11..ee060f7 100644 --- a/test-tool/test_unmap_vpd.c +++ b/test-tool/test_unmap_vpd.c @@ -40,7 +40,7 @@ test_unmap_vpd(void) logging(LOG_VERBOSE, "Check if UNMAP is available."); list[0].lba = 0; list[0].num = 0; - ret = unmap(sd->iscsi_ctx, sd->iscsi_lun, 0, list, 1, + ret = unmap(sd, 0, list, 1, EXPECT_STATUS_GOOD); if (ret != 0) { logging(LOG_VERBOSE, "UNMAP is not available. Verify that VPD " diff --git a/test-tool/test_verify10_0blocks.c b/test-tool/test_verify10_0blocks.c index 5f3a2d8..4ac008f 100644 --- a/test-tool/test_verify10_0blocks.c +++ b/test-tool/test_verify10_0blocks.c @@ -30,7 +30,7 @@ test_verify10_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 0-blocks at LBA==0"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = verify10(sd, 0, 0, block_size, 0, 0, 1, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -41,21 +41,21 @@ test_verify10_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY10 0-blocks one block past end-of-LUN"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = verify10(sd, num_blocks + 1, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY10 0-blocks at LBA==2^31"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, 0, + ret = verify10(sd, 0x80000000, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY10 0-blocks at LBA==-1"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = verify10(sd, -1, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify10_beyond_eol.c b/test-tool/test_verify10_beyond_eol.c index 73897aa..9b80296 100644 --- a/test-tool/test_verify10_beyond_eol.c +++ b/test-tool/test_verify10_beyond_eol.c @@ -42,7 +42,7 @@ test_verify10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = verify10(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -59,7 +59,7 @@ test_verify10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = verify10(sd, 0x80000000, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -71,7 +71,7 @@ test_verify10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = verify10(sd, -1, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -83,7 +83,7 @@ test_verify10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = verify10(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify10_flags.c b/test-tool/test_verify10_flags.c index 1cb7600..5bb109f 100644 --- a/test-tool/test_verify10_flags.c +++ b/test-tool/test_verify10_flags.c @@ -34,14 +34,14 @@ test_verify10_flags(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 flags"); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, block_size, + ret = read10(sd, NULL, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY10 with DPO==1"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify10(sd, 0, block_size, block_size, 0, 1, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -54,7 +54,7 @@ test_verify10_flags(void) logging(LOG_VERBOSE, "Test VERIFY10 with BYTCHK==1"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify10(sd, 0, block_size, block_size, 0, 0, 1, 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 a9c95a9..93e0c98 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -49,7 +49,7 @@ test_verify10_mismatch(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify10(sd, 0, i * block_size, block_size, 0, 0, 1, buf, EXPECT_MISCOMPARE); if (ret == -2) { @@ -66,7 +66,7 @@ test_verify10_mismatch(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks - i, + ret = read10(sd, NULL, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -75,7 +75,7 @@ test_verify10_mismatch(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify10(sd, num_blocks - i, i * block_size, block_size, 0, 0, 1, buf, EXPECT_MISCOMPARE); 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 3f60ad8..f8637b1 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -49,7 +49,7 @@ test_verify10_mismatch_no_cmp(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify10(sd, 0, i * block_size, block_size, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -67,7 +67,7 @@ test_verify10_mismatch_no_cmp(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks - i, + ret = read10(sd, NULL, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -76,7 +76,7 @@ test_verify10_mismatch_no_cmp(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify10(sd, num_blocks - i, i * block_size, block_size, 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 6d9c515..dca1139 100644 --- a/test-tool/test_verify10_simple.c +++ b/test-tool/test_verify10_simple.c @@ -38,12 +38,12 @@ test_verify10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify10(sd, 0, i * block_size, block_size, 0, 0, 1, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -59,12 +59,12 @@ test_verify10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks - i, + ret = read10(sd, NULL, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify10(sd, num_blocks - i, i * block_size, block_size, 0, 0, 1, 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 dc769cb..171e53c 100644 --- a/test-tool/test_verify10_vrprotect.c +++ b/test-tool/test_verify10_vrprotect.c @@ -40,12 +40,12 @@ 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, block_size, + ret = read10(sd, NULL, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); - ret = verify10(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify10(sd, 0, block_size, block_size, i, 0, 1, buf, EXPECT_INVALID_FIELD_IN_CDB); if (ret == -2) { diff --git a/test-tool/test_verify12_0blocks.c b/test-tool/test_verify12_0blocks.c index 6813d10..ea1b3d0 100644 --- a/test-tool/test_verify12_0blocks.c +++ b/test-tool/test_verify12_0blocks.c @@ -30,7 +30,7 @@ test_verify12_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 0-blocks at LBA==0"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = verify12(sd, 0, 0, block_size, 0, 0, 1, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -41,21 +41,21 @@ test_verify12_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY12 0-blocks one block past end-of-LUN"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = verify12(sd, num_blocks + 1, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY12 0-blocks at LBA==2^31"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, 0, + ret = verify12(sd, 0x80000000, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY12 0-blocks at LBA==-1"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = verify12(sd, -1, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify12_beyond_eol.c b/test-tool/test_verify12_beyond_eol.c index 3d153a9..4d56cf2 100644 --- a/test-tool/test_verify12_beyond_eol.c +++ b/test-tool/test_verify12_beyond_eol.c @@ -42,7 +42,7 @@ test_verify12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = verify12(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -59,7 +59,7 @@ test_verify12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = verify12(sd, 0x80000000, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -71,7 +71,7 @@ test_verify12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = verify12(sd, -1, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -83,7 +83,7 @@ test_verify12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = verify12(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify12_flags.c b/test-tool/test_verify12_flags.c index 4b6a76d..6c1900a 100644 --- a/test-tool/test_verify12_flags.c +++ b/test-tool/test_verify12_flags.c @@ -35,14 +35,14 @@ test_verify12_flags(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 flags"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = read12(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY12 with DPO==1"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify12(sd, 0, block_size, block_size, 0, 1, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -54,7 +54,7 @@ test_verify12_flags(void) logging(LOG_VERBOSE, "Test VERIFY12 with BYTCHK==1"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify12(sd, 0, block_size, block_size, 0, 0, 1, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify12_mismatch.c b/test-tool/test_verify12_mismatch.c index 92ffbbf..03f2c50 100644 --- a/test-tool/test_verify12_mismatch.c +++ b/test-tool/test_verify12_mismatch.c @@ -40,7 +40,7 @@ test_verify12_mismatch(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read12(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -48,7 +48,7 @@ test_verify12_mismatch(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify12(sd, 0, i * block_size, block_size, 0, 0, 1, buf, EXPECT_MISCOMPARE); if (ret == -2) { @@ -66,7 +66,7 @@ test_verify12_mismatch(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read12(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -75,7 +75,7 @@ test_verify12_mismatch(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify12(sd, num_blocks - i, i * block_size, block_size, 0, 0, 1, buf, EXPECT_MISCOMPARE); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify12_mismatch_no_cmp.c b/test-tool/test_verify12_mismatch_no_cmp.c index e982833..0d948ce 100644 --- a/test-tool/test_verify12_mismatch_no_cmp.c +++ b/test-tool/test_verify12_mismatch_no_cmp.c @@ -40,7 +40,7 @@ test_verify12_mismatch_no_cmp(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read12(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -48,7 +48,7 @@ test_verify12_mismatch_no_cmp(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify12(sd, 0, i * block_size, block_size, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -66,7 +66,7 @@ test_verify12_mismatch_no_cmp(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read12(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -75,7 +75,7 @@ test_verify12_mismatch_no_cmp(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify12(sd, num_blocks - i, i * block_size, block_size, 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 0dd6b81..3d43b90 100644 --- a/test-tool/test_verify12_simple.c +++ b/test-tool/test_verify12_simple.c @@ -38,12 +38,12 @@ test_verify12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify12(sd, 0, i * block_size, block_size, 0, 0, 1, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -59,12 +59,12 @@ test_verify12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read12(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify12(sd, num_blocks - i, i * block_size, block_size, 0, 0, 1, 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 30df81e..f17c584 100644 --- a/test-tool/test_verify12_vrprotect.c +++ b/test-tool/test_verify12_vrprotect.c @@ -41,10 +41,10 @@ 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, block_size, + ret = read10(sd, NULL, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); - ret = verify12(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify12(sd, 0, block_size, block_size, i, 0, 1, buf, EXPECT_INVALID_FIELD_IN_CDB); if (ret == -2) { diff --git a/test-tool/test_verify16_0blocks.c b/test-tool/test_verify16_0blocks.c index 15ecb04..2805ef0 100644 --- a/test-tool/test_verify16_0blocks.c +++ b/test-tool/test_verify16_0blocks.c @@ -30,7 +30,7 @@ test_verify16_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 0-blocks at LBA==0"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = verify16(sd, 0, 0, block_size, 0, 0, 1, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -41,21 +41,21 @@ test_verify16_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY16 0-blocks one block past end-of-LUN"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = verify16(sd, num_blocks + 1, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY16 0-blocks at LBA==2^63"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, 0, + ret = verify16(sd, 0x8000000000000000ULL, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test VERIFY16 0-blocks at LBA==-1"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = verify16(sd, -1, 0, block_size, 0, 0, 1, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify16_beyond_eol.c b/test-tool/test_verify16_beyond_eol.c index 59aae3c..e494b97 100644 --- a/test-tool/test_verify16_beyond_eol.c +++ b/test-tool/test_verify16_beyond_eol.c @@ -39,7 +39,7 @@ test_verify16_beyond_eol(void) break; } - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = verify16(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -57,7 +57,7 @@ test_verify16_beyond_eol(void) break; } - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = verify16(sd, 0x8000000000000000ULL, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -70,7 +70,7 @@ test_verify16_beyond_eol(void) break; } - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = verify16(sd, -1, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -83,7 +83,7 @@ test_verify16_beyond_eol(void) break; } - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = verify16(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 1, buf, EXPECT_LBA_OOB); diff --git a/test-tool/test_verify16_flags.c b/test-tool/test_verify16_flags.c index 4ebfa18..a91608a 100644 --- a/test-tool/test_verify16_flags.c +++ b/test-tool/test_verify16_flags.c @@ -35,12 +35,12 @@ test_verify16_flags(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 flags"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = read16(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Test VERIFY16 with DPO==1"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify16(sd, 0, block_size, block_size, 0, 1, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -52,7 +52,7 @@ test_verify16_flags(void) logging(LOG_VERBOSE, "Test VERIFY16 with BYTCHK==1"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify16(sd, 0, block_size, block_size, 0, 0, 1, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify16_mismatch.c b/test-tool/test_verify16_mismatch.c index d8d31e9..61701be 100644 --- a/test-tool/test_verify16_mismatch.c +++ b/test-tool/test_verify16_mismatch.c @@ -41,7 +41,7 @@ test_verify16_mismatch(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -49,7 +49,7 @@ test_verify16_mismatch(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify16(sd, 0, i * block_size, block_size, 0, 0, 1, buf, EXPECT_MISCOMPARE); if (ret == -2) { @@ -68,7 +68,7 @@ test_verify16_mismatch(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -77,7 +77,7 @@ test_verify16_mismatch(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 1, buf, EXPECT_MISCOMPARE); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify16_mismatch_no_cmp.c b/test-tool/test_verify16_mismatch_no_cmp.c index 3ad82cb..0c4fe39 100644 --- a/test-tool/test_verify16_mismatch_no_cmp.c +++ b/test-tool/test_verify16_mismatch_no_cmp.c @@ -41,7 +41,7 @@ test_verify16_mismatch_no_cmp(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = read16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -49,7 +49,7 @@ test_verify16_mismatch_no_cmp(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify16(sd, 0, i * block_size, block_size, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -68,7 +68,7 @@ test_verify16_mismatch_no_cmp(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -77,7 +77,7 @@ test_verify16_mismatch_no_cmp(void) buf[offset] ^= 'X'; logging(LOG_VERBOSE, "Flip some bits in the data"); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify16_simple.c b/test-tool/test_verify16_simple.c index 6389782..66c266f 100644 --- a/test-tool/test_verify16_simple.c +++ b/test-tool/test_verify16_simple.c @@ -38,10 +38,10 @@ test_verify16_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, i * block_size, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = verify16(sd, 0, i * block_size, block_size, 0, 0, 1, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -58,12 +58,12 @@ test_verify16_simple(void) break; } - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = verify16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 1, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_verify16_vrprotect.c b/test-tool/test_verify16_vrprotect.c index 1f91be3..cd0dc22 100644 --- a/test-tool/test_verify16_vrprotect.c +++ b/test-tool/test_verify16_vrprotect.c @@ -41,10 +41,10 @@ test_verify16_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 = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = read16(sd, 0, block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); - ret = verify16(sd->iscsi_ctx, sd->iscsi_lun, 0, block_size, + ret = verify16(sd, 0, block_size, block_size, i, 0, 1, buf, EXPECT_INVALID_FIELD_IN_CDB); if (ret == -2) { diff --git a/test-tool/test_write10_0blocks.c b/test-tool/test_write10_0blocks.c index 8621841..6967174 100644 --- a/test-tool/test_write10_0blocks.c +++ b/test-tool/test_write10_0blocks.c @@ -32,7 +32,7 @@ test_write10_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE10 0-blocks at LBA==0"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = write10(sd, 0, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -48,21 +48,21 @@ test_write10_0blocks(void) } logging(LOG_VERBOSE, "Test WRITE10 0-blocks one block past end-of-LUN"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = write10(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE10 0-blocks at LBA==2^31"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, 0, + ret = write10(sd, 0x80000000, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE10 0-blocks at LBA==-1"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = write10(sd, -1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write10_beyond_eol.c b/test-tool/test_write10_beyond_eol.c index 52f74e4..1e1ab09 100644 --- a/test-tool/test_write10_beyond_eol.c +++ b/test-tool/test_write10_beyond_eol.c @@ -44,7 +44,7 @@ test_write10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = write10(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -61,7 +61,7 @@ test_write10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = write10(sd, 0x80000000, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -73,7 +73,7 @@ test_write10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = write10(sd, -1, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -85,7 +85,7 @@ test_write10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = write10(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write10_flags.c b/test-tool/test_write10_flags.c index 9961116..f3305a8 100644 --- a/test-tool/test_write10_flags.c +++ b/test-tool/test_write10_flags.c @@ -38,7 +38,7 @@ test_write10_flags(void) logging(LOG_VERBOSE, "Test WRITE10 flags"); logging(LOG_VERBOSE, "Test WRITE10 with DPO==1"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write10(sd, 0, block_size, block_size, 0, 1, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -50,28 +50,28 @@ test_write10_flags(void) logging(LOG_VERBOSE, "Test WRITE10 with FUA==1 FUA_NV==0"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write10(sd, 0, block_size, block_size, 0, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE10 with FUA==1 FUA_NV==1"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write10(sd, 0, block_size, block_size, 0, 0, 1, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE10 with FUA==0 FUA_NV==1"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write10(sd, 0, block_size, block_size, 0, 0, 0, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE10 with DPO==1 FUA==1 FUA_NV==1"); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write10(sd, 0, block_size, block_size, 0, 1, 1, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write10_residuals.c b/test-tool/test_write10_residuals.c index a2e27f6..07f8931 100644 --- a/test-tool/test_write10_residuals.c +++ b/test-tool/test_write10_residuals.c @@ -241,7 +241,7 @@ test_write10_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write10(sd, 0, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -289,7 +289,7 @@ test_write10_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 2* block_size, + ret = read10(sd, NULL, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -317,7 +317,7 @@ test_write10_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write10(sd, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 2* block_size, + ret = read10(sd, NULL, 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_write10_simple.c b/test-tool/test_write10_simple.c index 74f21ab..aa50f82 100644 --- a/test-tool/test_write10_simple.c +++ b/test-tool/test_write10_simple.c @@ -42,7 +42,7 @@ test_write10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = write10(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -58,7 +58,7 @@ test_write10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = write10(sd, 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_write10_wrprotect.c b/test-tool/test_write10_wrprotect.c index acd4bc5..84ae438 100644 --- a/test-tool/test_write10_wrprotect.c +++ b/test-tool/test_write10_wrprotect.c @@ -44,7 +44,7 @@ test_write10_wrprotect(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 = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write10(sd, 0, block_size, block_size, i, 0, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_write12_0blocks.c b/test-tool/test_write12_0blocks.c index 81f9765..9d5cae3 100644 --- a/test-tool/test_write12_0blocks.c +++ b/test-tool/test_write12_0blocks.c @@ -37,7 +37,7 @@ test_write12_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE12 0-blocks at LBA==0"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = write12(sd, 0, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -48,21 +48,21 @@ test_write12_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE12 0-blocks one block past end-of-LUN"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = write12(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE12 0-blocks at LBA==2^31"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, 0, + ret = write12(sd, 0x80000000, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE12 0-blocks at LBA==-1"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = write12(sd, -1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write12_beyond_eol.c b/test-tool/test_write12_beyond_eol.c index ceb8c8d..a466356 100644 --- a/test-tool/test_write12_beyond_eol.c +++ b/test-tool/test_write12_beyond_eol.c @@ -44,7 +44,7 @@ test_write12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = write12(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -61,7 +61,7 @@ test_write12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = write12(sd, 0x80000000, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -73,7 +73,7 @@ test_write12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = write12(sd, -1, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -85,7 +85,7 @@ test_write12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = write12(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write12_flags.c b/test-tool/test_write12_flags.c index c610707..f2f68d4 100644 --- a/test-tool/test_write12_flags.c +++ b/test-tool/test_write12_flags.c @@ -38,7 +38,7 @@ test_write12_flags(void) logging(LOG_VERBOSE, "Test WRITE12 flags"); logging(LOG_VERBOSE, "Test WRITE12 with DPO==1"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write12(sd, 0, block_size, block_size, 0, 1, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -50,28 +50,28 @@ test_write12_flags(void) logging(LOG_VERBOSE, "Test WRITE12 with FUA==1 FUA_NV==0"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write12(sd, 0, block_size, block_size, 0, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE12 with FUA==1 FUA_NV==1"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write12(sd, 0, block_size, block_size, 0, 0, 1, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE12 with FUA==0 FUA_NV==1"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write12(sd, 0, block_size, block_size, 0, 0, 0, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE12 with DPO==1 FUA==1 FUA_NV==1"); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write12(sd, 0, block_size, block_size, 0, 1, 1, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write12_residuals.c b/test-tool/test_write12_residuals.c index 0551bc6..036f5df 100644 --- a/test-tool/test_write12_residuals.c +++ b/test-tool/test_write12_residuals.c @@ -241,7 +241,7 @@ test_write12_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write12(sd, 0, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -289,7 +289,7 @@ test_write12_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, 2* block_size, + ret = read12(sd, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -317,7 +317,7 @@ test_write12_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write12(sd, 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_write12_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, 2* block_size, + ret = read12(sd, 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_write12_simple.c b/test-tool/test_write12_simple.c index 6e4b5ec..1d9860b 100644 --- a/test-tool/test_write12_simple.c +++ b/test-tool/test_write12_simple.c @@ -41,7 +41,7 @@ test_write12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = write12(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -57,7 +57,7 @@ test_write12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = write12(sd, 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_write12_wrprotect.c b/test-tool/test_write12_wrprotect.c index dc573ba..b48ea12 100644 --- a/test-tool/test_write12_wrprotect.c +++ b/test-tool/test_write12_wrprotect.c @@ -45,7 +45,7 @@ test_write12_wrprotect(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 = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write12(sd, 0, block_size, block_size, i, 0, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_write16_0blocks.c b/test-tool/test_write16_0blocks.c index dd8b9c5..8eb6c8f 100644 --- a/test-tool/test_write16_0blocks.c +++ b/test-tool/test_write16_0blocks.c @@ -33,7 +33,7 @@ test_write16_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE16 0-blocks at LBA==0"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = write16(sd, 0, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -44,21 +44,21 @@ test_write16_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE16 0-blocks one block past end-of-LUN"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = write16(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE16 0-blocks at LBA==2^63"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, 0, + ret = write16(sd, 0x8000000000000000ULL, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE16 0-blocks at LBA==-1"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = write16(sd, -1, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write16_beyond_eol.c b/test-tool/test_write16_beyond_eol.c index 78ba03c..6da51d6 100644 --- a/test-tool/test_write16_beyond_eol.c +++ b/test-tool/test_write16_beyond_eol.c @@ -42,7 +42,7 @@ test_write16_beyond_eol(void) break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = write16(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -59,7 +59,7 @@ test_write16_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = write16(sd, 0x8000000000000000ULL, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -71,7 +71,7 @@ test_write16_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = write16(sd, -1, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -83,7 +83,7 @@ test_write16_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = write16(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write16_flags.c b/test-tool/test_write16_flags.c index 16f2bfe..3750c8a 100644 --- a/test-tool/test_write16_flags.c +++ b/test-tool/test_write16_flags.c @@ -39,7 +39,7 @@ test_write16_flags(void) logging(LOG_VERBOSE, "Test WRITE16 flags"); logging(LOG_VERBOSE, "Test WRITE16 with DPO==1"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, block_size, block_size, 0, 1, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -51,28 +51,28 @@ test_write16_flags(void) logging(LOG_VERBOSE, "Test WRITE16 with FUA==1 FUA_NV==0"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, block_size, block_size, 0, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE16 with FUA==1 FUA_NV==1"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, block_size, block_size, 0, 0, 1, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE16 with FUA==0 FUA_NV==1"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, block_size, block_size, 0, 0, 0, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITE16 with DPO==1 FUA==1 FUA_NV==1"); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, block_size, block_size, 0, 1, 1, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_write16_residuals.c b/test-tool/test_write16_residuals.c index ae6bfbc..6a6b46b 100644 --- a/test-tool/test_write16_residuals.c +++ b/test-tool/test_write16_residuals.c @@ -236,7 +236,7 @@ test_write16_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write16(sd, 0, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -284,7 +284,7 @@ test_write16_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, 2* block_size, + ret = read16(sd, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -312,7 +312,7 @@ test_write16_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write16(sd, 0, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -360,7 +360,7 @@ test_write16_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, 2* block_size, + ret = read16(sd, 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_write16_simple.c b/test-tool/test_write16_simple.c index 3e1de5a..10f54ea 100644 --- a/test-tool/test_write16_simple.c +++ b/test-tool/test_write16_simple.c @@ -43,7 +43,7 @@ test_write16_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = write16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -59,7 +59,7 @@ test_write16_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = write16(sd, 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_write16_wrprotect.c b/test-tool/test_write16_wrprotect.c index 778ff10..242dc2a 100644 --- a/test-tool/test_write16_wrprotect.c +++ b/test-tool/test_write16_wrprotect.c @@ -44,7 +44,7 @@ test_write16_wrprotect(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 = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, block_size, block_size, i, 0, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_writesame10_0blocks.c b/test-tool/test_writesame10_0blocks.c index 6151faf..cc07488 100644 --- a/test-tool/test_writesame10_0blocks.c +++ b/test-tool/test_writesame10_0blocks.c @@ -40,7 +40,7 @@ test_writesame10_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==0 (WSNZ=%d)", inq_bl->wsnz); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -59,21 +59,21 @@ test_writesame10_0blocks(void) } logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks one block past end-of-LUN"); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, + ret = writesame10(sd, num_blocks + 1, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==2^31"); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = writesame10(sd, 0x80000000, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==-1"); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, -1, + ret = writesame10(sd, -1, block_size, 0, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame10_beyond_eol.c b/test-tool/test_writesame10_beyond_eol.c index ce53a6c..183455e 100644 --- a/test-tool/test_writesame10_beyond_eol.c +++ b/test-tool/test_writesame10_beyond_eol.c @@ -43,7 +43,7 @@ test_writesame10_beyond_eol(void) logging(LOG_VERBOSE, "Test WRITESAME10 1-256 blocks one block beyond the end"); memset(buf, 0, block_size); for (i = 1; i <= 256; i++) { - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i + 1, + ret = writesame10(sd, num_blocks - i + 1, block_size, i, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -56,7 +56,7 @@ test_writesame10_beyond_eol(void) logging(LOG_VERBOSE, "Test WRITESAME10 1-256 blocks at LBA==2^31"); for (i = 1; i <= 256; i++) { - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = writesame10(sd, 0x80000000, block_size, i, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -65,7 +65,7 @@ test_writesame10_beyond_eol(void) logging(LOG_VERBOSE, "Test WRITESAME10 1-256 blocks at LBA==-1"); for (i = 1; i <= 256; i++) { - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, -1, + ret = writesame10(sd, -1, block_size, i, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -74,7 +74,7 @@ test_writesame10_beyond_eol(void) logging(LOG_VERBOSE, "Test WRITESAME10 2-256 blocks all but one block beyond the end"); for (i = 2; i <= 256; i++) { - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = writesame10(sd, num_blocks - 1, block_size, i, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame10_simple.c b/test-tool/test_writesame10_simple.c index 36b197a..7f33baf 100644 --- a/test-tool/test_writesame10_simple.c +++ b/test-tool/test_writesame10_simple.c @@ -40,7 +40,7 @@ test_writesame10_simple(void) memset(buf, 0, block_size); for (i = 1; i <= 256; i++) { - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, i, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -52,7 +52,7 @@ test_writesame10_simple(void) logging(LOG_VERBOSE, "Test WRITESAME10 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writesame10(sd, num_blocks - i, block_size, i, 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 d33a66f..07d7870 100644 --- a/test-tool/test_writesame10_unmap.c +++ b/test-tool/test_writesame10_unmap.c @@ -44,14 +44,14 @@ test_writesame10_unmap(void) for (i = 1; i <= 256; i++) { logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, i * block_size); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write10(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i); memset(buf, 0, block_size); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -62,7 +62,7 @@ test_writesame10_unmap(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -83,14 +83,14 @@ test_writesame10_unmap(void) for (i = 1; i <= 256; i++) { logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, i * block_size); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = write10(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i); memset(buf, 0, block_size); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writesame10(sd, num_blocks - i, block_size, i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -101,7 +101,7 @@ test_writesame10_unmap(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks - i, + ret = read10(sd, NULL, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -118,7 +118,7 @@ test_writesame10_unmap(void) logging(LOG_VERBOSE, "Verify that WRITESAME10 ANCHOR==1 + UNMAP==0 is " "invalid"); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, 1, 1, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); CU_ASSERT_EQUAL(ret, 0); @@ -128,13 +128,13 @@ test_writesame10_unmap(void) if (inq_lbp->anc_sup) { logging(LOG_VERBOSE, "Test WRITESAME10 ANCHOR==1 + UNMAP==0"); memset(buf, 0, block_size); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, 1, 1, 1, 0, 0, buf, EXPECT_STATUS_GOOD); } else { logging(LOG_VERBOSE, "Test WRITESAME10 ANCHOR==1 + UNMAP==0 no " "ANC_SUP so expecting to fail"); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, 1, 1, 1, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); } @@ -159,14 +159,14 @@ test_writesame10_unmap(void) logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, i * block_size); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write10(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i); memset(buf, 0, block_size); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -177,7 +177,7 @@ test_writesame10_unmap(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, + ret = read10(sd, NULL, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -196,7 +196,7 @@ test_writesame10_unmap(void) "INVALID_FIELD_IN_CDB."); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, i, 0, 1, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame10_unmap_unaligned.c b/test-tool/test_writesame10_unmap_unaligned.c index 9147f27..3a121eb 100644 --- a/test-tool/test_writesame10_unmap_unaligned.c +++ b/test-tool/test_writesame10_unmap_unaligned.c @@ -41,7 +41,7 @@ test_writesame10_unmap_unaligned(void) logging(LOG_VERBOSE, "Test that unaligned WRITESAME10 Unmap succeeds. LBPPB==%d", lbppb); for (i = 1; i < lbppb; i++) { logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10 at LBA:%d", lbppb - i, i); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, i, + ret = writesame10(sd, i, block_size, lbppb - i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame10_unmap_until_end.c b/test-tool/test_writesame10_unmap_until_end.c index 05dffa3..6b9bfdd 100644 --- a/test-tool/test_writesame10_unmap_until_end.c +++ b/test-tool/test_writesame10_unmap_until_end.c @@ -47,13 +47,13 @@ test_writesame10_unmap_until_end(void) logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, block_size * i); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = write10(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10", i); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writesame10(sd, num_blocks - i, block_size, i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -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(sd->iscsi_ctx, NULL, sd->iscsi_lun, num_blocks - i, + ret = read10(sd, NULL, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); diff --git a/test-tool/test_writesame10_unmap_vpd.c b/test-tool/test_writesame10_unmap_vpd.c index aece9d6..736fac9 100644 --- a/test-tool/test_writesame10_unmap_vpd.c +++ b/test-tool/test_writesame10_unmap_vpd.c @@ -42,7 +42,7 @@ test_writesame10_unmap_vpd(void) logging(LOG_VERBOSE, "Check if WRITESAME10 can be used for UNMAP."); logging(LOG_VERBOSE, "Unmap 1 block using WRITESAME10"); memset(buf, 0, block_size); - ret = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, 1, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret != 0) { diff --git a/test-tool/test_writesame10_wrprotect.c b/test-tool/test_writesame10_wrprotect.c index c6f1a91..ad02d06 100644 --- a/test-tool/test_writesame10_wrprotect.c +++ b/test-tool/test_writesame10_wrprotect.c @@ -45,7 +45,7 @@ test_writesame10_wrprotect(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 = writesame10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame10(sd, 0, block_size, 1, 0, 0, i, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); if (ret == -2) { diff --git a/test-tool/test_writesame16_0blocks.c b/test-tool/test_writesame16_0blocks.c index b547c9e..68cff38 100644 --- a/test-tool/test_writesame16_0blocks.c +++ b/test-tool/test_writesame16_0blocks.c @@ -34,7 +34,7 @@ test_writesame16_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME16 0-blocks at LBA==0 (WSNZ=%d)", inq_bl->wsnz); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, 0, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -54,21 +54,21 @@ test_writesame16_0blocks(void) } logging(LOG_VERBOSE, "Test WRITESAME16 0-blocks one block past end-of-LUN"); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, + ret = writesame16(sd, num_blocks + 1, block_size, inq_bl->wsnz, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITESAME16 0-blocks at LBA==2^63"); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = writesame16(sd, 0x8000000000000000ULL, block_size, inq_bl->wsnz, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITESAME16 0-blocks at LBA==-1"); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, -1, + ret = writesame16(sd, -1, block_size, inq_bl->wsnz, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame16_beyond_eol.c b/test-tool/test_writesame16_beyond_eol.c index 12ea43a..4a68ace 100644 --- a/test-tool/test_writesame16_beyond_eol.c +++ b/test-tool/test_writesame16_beyond_eol.c @@ -38,7 +38,7 @@ test_writesame16_beyond_eol(void) logging(LOG_VERBOSE, "Test WRITESAME16 1-256 blocks one block beyond the end"); memset(buf, 0, block_size); for (i = 1; i <= 256; i++) { - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i + 1, + ret = writesame16(sd, num_blocks - i + 1, block_size, i, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -52,7 +52,7 @@ test_writesame16_beyond_eol(void) logging(LOG_VERBOSE, "Test WRITESAME16 1-256 blocks at LBA==2^63"); for (i = 1; i <= 256; i++) { - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = writesame16(sd, 0x8000000000000000ULL, block_size, i, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -61,7 +61,7 @@ test_writesame16_beyond_eol(void) logging(LOG_VERBOSE, "Test WRITESAME16 1-256 blocks at LBA==-1"); for (i = 1; i <= 256; i++) { - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, -1, + ret = writesame16(sd, -1, block_size, i, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -70,7 +70,7 @@ test_writesame16_beyond_eol(void) logging(LOG_VERBOSE, "Test WRITESAME16 2-256 blocks all but one block beyond the end"); for (i = 2; i <= 256; i++) { - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = writesame16(sd, num_blocks - 1, block_size, i, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame16_simple.c b/test-tool/test_writesame16_simple.c index 3ec0bd1..ac7eded 100644 --- a/test-tool/test_writesame16_simple.c +++ b/test-tool/test_writesame16_simple.c @@ -40,7 +40,7 @@ test_writesame16_simple(void) memset(buf, 0, block_size); for (i = 1; i <= 256; i++) { - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, i, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -53,7 +53,7 @@ test_writesame16_simple(void) logging(LOG_VERBOSE, "Test WRITESAME16 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writesame16(sd, num_blocks - i, block_size, i, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame16_unmap.c b/test-tool/test_writesame16_unmap.c index 02e2ddb..04280c8 100644 --- a/test-tool/test_writesame16_unmap.c +++ b/test-tool/test_writesame16_unmap.c @@ -46,12 +46,12 @@ test_writesame16_unmap(void) for (i = 1; i <= 256; i++) { logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, i * block_size); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); memset(buf, 0, block_size); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -66,7 +66,7 @@ test_writesame16_unmap(void) "blocks back and verify they are all zero"); logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -84,14 +84,14 @@ test_writesame16_unmap(void) for (i = 1; i <= 256; i++) { logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, i * block_size); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = write16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); memset(buf, 0, block_size); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writesame16(sd, num_blocks - i, block_size, i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -101,7 +101,7 @@ test_writesame16_unmap(void) "blocks back and verify they are all zero"); logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -115,7 +115,7 @@ test_writesame16_unmap(void) } logging(LOG_VERBOSE, "Verify that WRITESAME16 ANCHOR==1 + UNMAP==0 is invalid"); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, 1, 1, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); CU_ASSERT_EQUAL(ret, 0); @@ -125,12 +125,12 @@ test_writesame16_unmap(void) if (inq_lbp->anc_sup) { logging(LOG_VERBOSE, "Test WRITESAME16 ANCHOR==1 + UNMAP==0"); memset(buf, 0, block_size); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, 1, 1, 1, 0, 0, buf, EXPECT_STATUS_GOOD); } else { logging(LOG_VERBOSE, "Test WRITESAME16 ANCHOR==1 + UNMAP==0 no ANC_SUP so expecting to fail"); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, 1, 1, 1, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); } @@ -156,14 +156,14 @@ test_writesame16_unmap(void) logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, i * block_size); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); memset(buf, 0, block_size); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -174,7 +174,7 @@ test_writesame16_unmap(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -191,7 +191,7 @@ test_writesame16_unmap(void) "INVALID_FIELD_IN_CDB."); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, i, 0, 1, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); CU_ASSERT_EQUAL(ret, 0); @@ -208,14 +208,14 @@ test_writesame16_unmap(void) logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, i * block_size); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = write16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); memset(buf, 0, block_size); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, i, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -226,7 +226,7 @@ test_writesame16_unmap(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = read16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); @@ -243,7 +243,7 @@ test_writesame16_unmap(void) "INVALID_FIELD_IN_CDB."); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, i, 0, 1, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writesame16_unmap_unaligned.c b/test-tool/test_writesame16_unmap_unaligned.c index 7e53a47..b25c499 100644 --- a/test-tool/test_writesame16_unmap_unaligned.c +++ b/test-tool/test_writesame16_unmap_unaligned.c @@ -41,7 +41,7 @@ test_writesame16_unmap_unaligned(void) for (i = 1; i < lbppb; i++) { logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16 at LBA:%d", lbppb - i, i); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, i, 0, lbppb - i, + ret = writesame16(sd, i, 0, lbppb - i, 0, 1, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { diff --git a/test-tool/test_writesame16_unmap_until_end.c b/test-tool/test_writesame16_unmap_until_end.c index c9db6e9..76e0d58 100644 --- a/test-tool/test_writesame16_unmap_until_end.c +++ b/test-tool/test_writesame16_unmap_until_end.c @@ -47,11 +47,11 @@ test_writesame16_unmap_until_end(void) for (i = 1; i <= 256; i++) { logging(LOG_VERBOSE, "Write %d blocks of 0xFF", i); memset(buf, 0xff, block_size * i); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = write16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16", i); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writesame16(sd, num_blocks - i, 0, i, 0, 1, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -67,7 +67,7 @@ test_writesame16_unmap_until_end(void) logging(LOG_VERBOSE, "Read %d blocks and verify they " "are now zero", i); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = read16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); diff --git a/test-tool/test_writesame16_unmap_vpd.c b/test-tool/test_writesame16_unmap_vpd.c index c6f1108..81c8c4c 100644 --- a/test-tool/test_writesame16_unmap_vpd.c +++ b/test-tool/test_writesame16_unmap_vpd.c @@ -43,7 +43,7 @@ test_writesame16_unmap_vpd(void) logging(LOG_VERBOSE, "Unmap 1 block using WRITESAME16"); memset(buf, 0, block_size); - ret = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, 1, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret != 0) { diff --git a/test-tool/test_writesame16_wrprotect.c b/test-tool/test_writesame16_wrprotect.c index dd38a4d..001306c 100644 --- a/test-tool/test_writesame16_wrprotect.c +++ b/test-tool/test_writesame16_wrprotect.c @@ -45,7 +45,7 @@ test_writesame16_wrprotect(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 = writesame16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writesame16(sd, 0, block_size, 1, 0, 0, i, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); if (ret == -2) { diff --git a/test-tool/test_writeverify10_0blocks.c b/test-tool/test_writeverify10_0blocks.c index 7ee7d46..bda5bbe 100644 --- a/test-tool/test_writeverify10_0blocks.c +++ b/test-tool/test_writeverify10_0blocks.c @@ -37,7 +37,7 @@ test_writeverify10_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITEVERIFY10 0-blocks at LBA==0"); - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = writeverify10(sd, 0, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -48,21 +48,21 @@ test_writeverify10_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY10 0-blocks one block past end-of-LUN"); - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = writeverify10(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY10 0-blocks at LBA==2^31"); - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, 0, + ret = writeverify10(sd, 0x80000000, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY10 0-blocks at LBA==-1"); - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = writeverify10(sd, -1, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify10_beyond_eol.c b/test-tool/test_writeverify10_beyond_eol.c index 705124d..fa6778a 100644 --- a/test-tool/test_writeverify10_beyond_eol.c +++ b/test-tool/test_writeverify10_beyond_eol.c @@ -44,7 +44,7 @@ test_writeverify10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = writeverify10(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -61,7 +61,7 @@ test_writeverify10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = writeverify10(sd, 0x80000000, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -73,7 +73,7 @@ test_writeverify10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = writeverify10(sd, -1, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -85,7 +85,7 @@ test_writeverify10_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = writeverify10(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify10_flags.c b/test-tool/test_writeverify10_flags.c index 2cf59be..2461cbe 100644 --- a/test-tool/test_writeverify10_flags.c +++ b/test-tool/test_writeverify10_flags.c @@ -38,7 +38,7 @@ test_writeverify10_flags(void) logging(LOG_VERBOSE, "Test WRITEVERIFY10 flags"); logging(LOG_VERBOSE, "Test WRITEVERIFY10 with DPO==1"); - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify10(sd, 0, block_size, block_size, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -49,7 +49,7 @@ test_writeverify10_flags(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY10 with BYTCHK==1"); - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify10(sd, 0, block_size, block_size, 0, 0, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify10_residuals.c b/test-tool/test_writeverify10_residuals.c index 79b6d73..6c8069a 100644 --- a/test-tool/test_writeverify10_residuals.c +++ b/test-tool/test_writeverify10_residuals.c @@ -44,7 +44,7 @@ test_writeverify10_residuals(void) CHECK_FOR_SBC; /* check if writeverify10 is supported */ - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, + ret = writeverify10(sd, 0, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -246,7 +246,7 @@ test_writeverify10_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write10(sd, 0, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -294,7 +294,7 @@ test_writeverify10_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read10(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 2* block_size, + ret = read10(sd, NULL, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -322,7 +322,7 @@ test_writeverify10_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write10(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write10(sd, 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(sd->iscsi_ctx, NULL, sd->iscsi_lun, 0, 2* block_size, + ret = read10(sd, NULL, 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_writeverify10_simple.c b/test-tool/test_writeverify10_simple.c index d59446d..4e64767 100644 --- a/test-tool/test_writeverify10_simple.c +++ b/test-tool/test_writeverify10_simple.c @@ -41,7 +41,7 @@ test_writeverify10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = writeverify10(sd, 0, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -57,7 +57,7 @@ test_writeverify10_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writeverify10(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify10_wrprotect.c b/test-tool/test_writeverify10_wrprotect.c index efb1cc7..8f38524 100644 --- a/test-tool/test_writeverify10_wrprotect.c +++ b/test-tool/test_writeverify10_wrprotect.c @@ -44,7 +44,7 @@ test_writeverify10_wrprotect(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 = writeverify10(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify10(sd, 0, block_size, block_size, i, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_writeverify12_0blocks.c b/test-tool/test_writeverify12_0blocks.c index 893f641..f23287a 100644 --- a/test-tool/test_writeverify12_0blocks.c +++ b/test-tool/test_writeverify12_0blocks.c @@ -37,7 +37,7 @@ test_writeverify12_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITEVERIFY12 0-blocks at LBA==0"); - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, block_size, + ret = writeverify12(sd, 0, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -48,21 +48,21 @@ test_writeverify12_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY12 0-blocks one block past end-of-LUN"); - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, 0, + ret = writeverify12(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY12 0-blocks at LBA==2^31"); - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, 0, + ret = writeverify12(sd, 0x80000000, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY12 0-blocks at LBA==-1"); - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, -1, 0, block_size, + ret = writeverify12(sd, -1, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify12_beyond_eol.c b/test-tool/test_writeverify12_beyond_eol.c index be503fd..009ba1f 100644 --- a/test-tool/test_writeverify12_beyond_eol.c +++ b/test-tool/test_writeverify12_beyond_eol.c @@ -44,7 +44,7 @@ test_writeverify12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = writeverify12(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -61,7 +61,7 @@ test_writeverify12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0x80000000, + ret = writeverify12(sd, 0x80000000, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -73,7 +73,7 @@ test_writeverify12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, -1, i * block_size, + ret = writeverify12(sd, -1, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -85,7 +85,7 @@ test_writeverify12_beyond_eol(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = writeverify12(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify12_flags.c b/test-tool/test_writeverify12_flags.c index 13a2abc..5c0a6e3 100644 --- a/test-tool/test_writeverify12_flags.c +++ b/test-tool/test_writeverify12_flags.c @@ -38,7 +38,7 @@ test_writeverify12_flags(void) logging(LOG_VERBOSE, "Test WRITEVERIFY12 flags"); logging(LOG_VERBOSE, "Test WRITEVERIFY12 with DPO==1"); - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify12(sd, 0, block_size, block_size, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -49,7 +49,7 @@ test_writeverify12_flags(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY12 with BYTCHK==1"); - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify12(sd, 0, block_size, block_size, 0, 0, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify12_residuals.c b/test-tool/test_writeverify12_residuals.c index 4285dea..ffe91f7 100644 --- a/test-tool/test_writeverify12_residuals.c +++ b/test-tool/test_writeverify12_residuals.c @@ -44,7 +44,7 @@ test_writeverify12_residuals(void) CHECK_FOR_SBC; /* check if writeverify12 is supported */ - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, + ret = writeverify12(sd, 0, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -246,7 +246,7 @@ test_writeverify12_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write12(sd, 0, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -294,7 +294,7 @@ test_writeverify12_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, 2* block_size, + ret = read12(sd, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -322,7 +322,7 @@ test_writeverify12_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write12(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write12(sd, 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_writeverify12_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read12(sd->iscsi_ctx, sd->iscsi_lun, 0, 2* block_size, + ret = read12(sd, 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_writeverify12_simple.c b/test-tool/test_writeverify12_simple.c index 57e14e1..8ddefa3 100644 --- a/test-tool/test_writeverify12_simple.c +++ b/test-tool/test_writeverify12_simple.c @@ -41,7 +41,7 @@ test_writeverify12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = writeverify12(sd, 0, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -57,7 +57,7 @@ test_writeverify12_simple(void) if (maximum_transfer_length && maximum_transfer_length < i) { break; } - ret = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writeverify12(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify12_wrprotect.c b/test-tool/test_writeverify12_wrprotect.c index 0e00407..8923d65 100644 --- a/test-tool/test_writeverify12_wrprotect.c +++ b/test-tool/test_writeverify12_wrprotect.c @@ -44,7 +44,7 @@ test_writeverify12_wrprotect(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 = writeverify12(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify12(sd, 0, block_size, block_size, i, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB); diff --git a/test-tool/test_writeverify16_0blocks.c b/test-tool/test_writeverify16_0blocks.c index c00a623..cfbe32b 100644 --- a/test-tool/test_writeverify16_0blocks.c +++ b/test-tool/test_writeverify16_0blocks.c @@ -33,7 +33,7 @@ test_writeverify16_0blocks(void) logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITEVERIFY16 0-blocks at LBA==0"); - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify16(sd, 0, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -44,21 +44,21 @@ test_writeverify16_0blocks(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY16 0-blocks one block past end-of-LUN"); - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1, + ret = writeverify16(sd, num_blocks + 1, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY16 0-blocks at LBA==2^63"); - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = writeverify16(sd, 0x8000000000000000ULL, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY16 0-blocks at LBA==-1"); - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, -1, + ret = writeverify16(sd, -1, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify16_beyond_eol.c b/test-tool/test_writeverify16_beyond_eol.c index 4ee704f..11e5b81 100644 --- a/test-tool/test_writeverify16_beyond_eol.c +++ b/test-tool/test_writeverify16_beyond_eol.c @@ -41,7 +41,7 @@ test_writeverify16_beyond_eol(void) break; } - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks + 1 - i, + ret = writeverify16(sd, num_blocks + 1 - i, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); if (ret == -2) { @@ -59,7 +59,7 @@ test_writeverify16_beyond_eol(void) break; } - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0x8000000000000000ULL, + ret = writeverify16(sd, 0x8000000000000000ULL, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -72,7 +72,7 @@ test_writeverify16_beyond_eol(void) break; } - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, -1, + ret = writeverify16(sd, -1, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); @@ -85,7 +85,7 @@ test_writeverify16_beyond_eol(void) break; } - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - 1, + ret = writeverify16(sd, num_blocks - 1, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_LBA_OOB); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify16_flags.c b/test-tool/test_writeverify16_flags.c index 62d8d13..6316b83 100644 --- a/test-tool/test_writeverify16_flags.c +++ b/test-tool/test_writeverify16_flags.c @@ -38,7 +38,7 @@ test_writeverify16_flags(void) logging(LOG_VERBOSE, "Test WRITEVERIFY16 flags"); logging(LOG_VERBOSE, "Test WRITEVERIFY16 with DPO==1"); - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify16(sd, 0, block_size, block_size, 0, 1, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -49,7 +49,7 @@ test_writeverify16_flags(void) CU_ASSERT_EQUAL(ret, 0); logging(LOG_VERBOSE, "Test WRITEVERIFY16 with BYTCHK==1"); - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify16(sd, 0, block_size, block_size, 0, 0, 1, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify16_residuals.c b/test-tool/test_writeverify16_residuals.c index a648551..281e3f0 100644 --- a/test-tool/test_writeverify16_residuals.c +++ b/test-tool/test_writeverify16_residuals.c @@ -44,7 +44,7 @@ test_writeverify16_residuals(void) CHECK_FOR_SBC; /* check if writeverify16 is supported */ - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0, 0, + ret = writeverify16(sd, 0, 0, block_size, 0, 0, 0, 0, NULL, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -247,7 +247,7 @@ test_writeverify16_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write16(sd, 0, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -295,7 +295,7 @@ test_writeverify16_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, 2* block_size, + ret = read16(sd, 0, 2* block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -323,7 +323,7 @@ test_writeverify16_residuals(void) logging(LOG_VERBOSE, "Write two blocks of 'a'"); memset(buf, 'a', 10000); - ret = write16(sd->iscsi_ctx, sd->iscsi_lun, 0, 2 * block_size, + ret = write16(sd, 0, 2 * block_size, block_size, 0, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); @@ -371,7 +371,7 @@ test_writeverify16_residuals(void) task = NULL; logging(LOG_VERBOSE, "Read the two blocks"); - ret = read16(sd->iscsi_ctx, sd->iscsi_lun, 0, 2* block_size, + ret = read16(sd, 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_writeverify16_simple.c b/test-tool/test_writeverify16_simple.c index ff4973d..581b055 100644 --- a/test-tool/test_writeverify16_simple.c +++ b/test-tool/test_writeverify16_simple.c @@ -43,7 +43,7 @@ test_writeverify16_simple(void) break; } - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0, i * block_size, + ret = writeverify16(sd, 0, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); if (ret == -2) { @@ -60,7 +60,7 @@ test_writeverify16_simple(void) break; } - ret = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, num_blocks - i, + ret = writeverify16(sd, num_blocks - i, i * block_size, block_size, 0, 0, 0, 0, buf, EXPECT_STATUS_GOOD); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_writeverify16_wrprotect.c b/test-tool/test_writeverify16_wrprotect.c index 6ec225d..b104c88 100644 --- a/test-tool/test_writeverify16_wrprotect.c +++ b/test-tool/test_writeverify16_wrprotect.c @@ -46,7 +46,7 @@ test_writeverify16_wrprotect(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 = writeverify16(sd->iscsi_ctx, sd->iscsi_lun, 0, + ret = writeverify16(sd, 0, block_size, block_size, i, 0, 0, 0, buf, EXPECT_INVALID_FIELD_IN_CDB);