[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/53] iscsi: handle check condition status in retry loop
From: |
Paolo Bonzini |
Subject: |
[PULL 34/53] iscsi: handle check condition status in retry loop |
Date: |
Mon, 6 Jul 2020 12:41:36 -0400 |
From: Xie Yongji <xieyongji@bytedance.com>
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>
---
block/iscsi.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index a8b76979d8..2964c9f8d2 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));
+ }
}
}
}
--
2.26.2
- [PULL 28/53] Makefile: simplify MINIKCONF rules, (continued)
[PULL 36/53] chardev/tcp: fix error message double free error, Paolo Bonzini, 2020/07/06
[PULL 48/53] target/i386/kvm: Simplify get_para_features(), Paolo Bonzini, 2020/07/06
[PULL 44/53] softmmu/vl: Remove the check for colons in -accel parameters, Paolo Bonzini, 2020/07/06
[PULL 52/53] target/i386: Enable TSX Suspend Load Address Tracking feature, Paolo Bonzini, 2020/07/06
[PULL 51/53] target/i386: Add SERIALIZE cpu feature, Paolo Bonzini, 2020/07/06
[PULL 34/53] iscsi: handle check condition status in retry loop,
Paolo Bonzini <=
[PULL 50/53] target/i386/kvm: Simplify kvm_get_supported_[feature]_msrs(), Paolo Bonzini, 2020/07/06
[PULL 42/53] cpu-throttle: new module, extracted from cpus.c, Paolo Bonzini, 2020/07/06
[PULL 43/53] cpu-timers, icount: new modules, Paolo Bonzini, 2020/07/06
[PULL 39/53] cpus: Move CPU code from exec.c to cpus-common.c, Paolo Bonzini, 2020/07/06
Re: [PULL 00/53] Misc patches for QEMU 5.1 soft freeze, no-reply, 2020/07/06
Re: [PULL 00/53] Misc patches for QEMU 5.1 soft freeze, Peter Maydell, 2020/07/07