[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/19] iscsi: base all handling of check condition on
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 05/19] iscsi: base all handling of check condition on scsi_sense_to_errno |
Date: |
Tue, 16 Jul 2019 10:11:03 +0200 |
Now that scsi-disk is not using scsi_sense_to_errno to separate
guest-recoverable
sense codes, we can modify it to simplify iscsi's own sense handling.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/iscsi.c | 29 ++++++++++++++---------------
scsi/utils.c | 5 ++---
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 6e238bf..506bf5f 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -225,9 +225,9 @@ static inline unsigned exp_random(double mean)
static int iscsi_translate_sense(struct scsi_sense *sense)
{
- return - scsi_sense_to_errno(sense->key,
- (sense->ascq & 0xFF00) >> 8,
- sense->ascq & 0xFF);
+ return scsi_sense_to_errno(sense->key,
+ (sense->ascq & 0xFF00) >> 8,
+ sense->ascq & 0xFF);
}
/* Called (via iscsi_service) with QemuMutex held. */
@@ -244,13 +244,6 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int
status,
if (status != SCSI_STATUS_GOOD) {
if (iTask->retries++ < ISCSI_CMD_RETRIES) {
- if (status == SCSI_STATUS_CHECK_CONDITION
- && task->sense.key == SCSI_SENSE_UNIT_ATTENTION) {
- error_report("iSCSI CheckCondition: %s",
- iscsi_get_error(iscsi));
- iTask->do_retry = 1;
- goto out;
- }
if (status == SCSI_STATUS_BUSY ||
status == SCSI_STATUS_TIMEOUT ||
status == SCSI_STATUS_TASK_SET_FULL) {
@@ -272,14 +265,20 @@ 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;
- goto out;
+ }
+ } 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));
}
}
- iTask->err_code = iscsi_translate_sense(&task->sense);
- iTask->err_str = g_strdup(iscsi_get_error(iscsi));
}
-out:
if (iTask->co) {
aio_bh_schedule_oneshot(iTask->iscsilun->aio_context,
iscsi_co_generic_bh_cb, iTask);
@@ -974,7 +973,7 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status,
if (status < 0) {
error_report("Failed to ioctl(SG_IO) to iSCSI lun. %s",
iscsi_get_error(iscsi));
- acb->status = iscsi_translate_sense(&acb->task->sense);
+ acb->status = -iscsi_translate_sense(&acb->task->sense);
}
acb->ioh->driver_status = 0;
diff --git a/scsi/utils.c b/scsi/utils.c
index 873d49c..c50e81f 100644
--- a/scsi/utils.c
+++ b/scsi/utils.c
@@ -379,8 +379,7 @@ int scsi_sense_to_errno(int key, int asc, int ascq)
case NO_SENSE:
case RECOVERED_ERROR:
case UNIT_ATTENTION:
- /* These sense keys are not errors */
- return 0;
+ return EAGAIN;
case ABORTED_COMMAND: /* COMMAND ABORTED */
return ECANCELED;
case NOT_READY:
@@ -409,7 +408,7 @@ int scsi_sense_to_errno(int key, int asc, int ascq)
case 0x2700: /* WRITE PROTECTED */
return EACCES;
case 0x0401: /* NOT READY, IN PROGRESS OF BECOMING READY */
- return EAGAIN;
+ return EINPROGRESS;
case 0x0402: /* NOT READY, INITIALIZING COMMAND REQUIRED */
return ENOTCONN;
default:
--
1.8.3.1
- [Qemu-devel] [PULL 00/19] Bugfix/cleanup patches for 2019-07-16, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 01/19] scsi-disk: pass sense correctly for guest-recoverable errors, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 02/19] scsi: explicitly list guest-recoverable sense codes, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 03/19] scsi: add guest-recoverable ZBC errors, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 04/19] iscsi: fix busy/timeout/task set full, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 05/19] iscsi: base all handling of check condition on scsi_sense_to_errno,
Paolo Bonzini <=
- [Qemu-devel] [PULL 06/19] build-sys: remove slirp cflags from main-loop.o, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 07/19] rdmacm-mux: fix strcpy string warning, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 08/19] hw/i386: turn off vmport if CONFIG_VMPORT is disabled, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 09/19] memory: unref the memory region in simplify flatview, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 10/19] Fix broken build with WHPX enabled, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 11/19] util: merge main-loop.c and iohandler.c, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 12/19] hw/lm32/Kconfig: Milkymist One provides a USB 1.1 Controller, Paolo Bonzini, 2019/07/16
- [Qemu-devel] [PULL 14/19] target/i386: sev: Do not unpin ram device memory region, Paolo Bonzini, 2019/07/16