diff options
| author | Xie Yongji <xieyongji@bytedance.com> | 2020-07-01 18:54:43 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-07-10 18:02:23 -0400 |
| commit | dd3b00202a5ff4153a0088917ac69d2e6cd2bc1f (patch) | |
| tree | a7f069fefc04e1ed0e0c067a023c715e2193536a /block | |
| parent | 1b38750c40281dd0d068f8536b2ea95d7b9bd585 (diff) | |
| download | qemu-dd3b00202a5ff4153a0088917ac69d2e6cd2bc1f.zip qemu-dd3b00202a5ff4153a0088917ac69d2e6cd2bc1f.tar.gz qemu-dd3b00202a5ff4153a0088917ac69d2e6cd2bc1f.tar.bz2 | |
iscsi: handle check condition status in retry loop
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/iscsi.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index 6c2e353..7519b09 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -266,16 +266,16 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, timer_mod(&iTask->retry_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_time); iTask->do_retry = 1; - } - } else if (status == SCSI_STATUS_CHECK_CONDITION) { - int error = iscsi_translate_sense(&task->sense); - if (error == EAGAIN) { - error_report("iSCSI CheckCondition: %s", - iscsi_get_error(iscsi)); - iTask->do_retry = 1; - } else { - iTask->err_code = -error; - iTask->err_str = g_strdup(iscsi_get_error(iscsi)); + } else if (status == SCSI_STATUS_CHECK_CONDITION) { + int error = iscsi_translate_sense(&task->sense); + if (error == EAGAIN) { + error_report("iSCSI CheckCondition: %s", + iscsi_get_error(iscsi)); + iTask->do_retry = 1; + } else { + iTask->err_code = -error; + iTask->err_str = g_strdup(iscsi_get_error(iscsi)); + } } } } |