mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iscsi: handle check condition status in retry loop

Browse Source 
The handling of check condition was incorrect because
we would only do it after retries exceed maximum.

Fixes: 8c460269aa ("iscsi: base all handling of check condition on scsi_sense_to_errno")
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Message-Id: <20200701105444.3226-1-xieyongji@bytedance.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Xie Yongji 2020-07-01 18:54:43 +08:00 committed by Paolo Bonzini
parent 1b38750c40
commit dd3b00202a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
block/iscsi.c
View File

@ -266,16 +266,16 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
timer_mod(&iTask->retry_timer, timer_mod(&iTask->retry_timer,
qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_time); qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_time);
iTask->do_retry = 1; iTask->do_retry = 1;
} } else if (status == SCSI_STATUS_CHECK_CONDITION) {
} else if (status == SCSI_STATUS_CHECK_CONDITION) { int error = iscsi_translate_sense(&task->sense);
int error = iscsi_translate_sense(&task->sense); if (error == EAGAIN) {
if (error == EAGAIN) { error_report("iSCSI CheckCondition: %s",
error_report("iSCSI CheckCondition: %s", iscsi_get_error(iscsi));
iscsi_get_error(iscsi)); iTask->do_retry = 1;
iTask->do_retry = 1; } else {
} else { iTask->err_code = -error;
iTask->err_code = -error; iTask->err_str = g_strdup(iscsi_get_error(iscsi));
iTask->err_str = g_strdup(iscsi_get_error(iscsi)); }
} }
} }
} }