[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/10] scsi: Rename linux-specific SG_ERR codes to generic SCSI_H
From: |
Paolo Bonzini |
Subject: |
[PATCH 07/10] scsi: Rename linux-specific SG_ERR codes to generic SCSI_HOST error codes |
Date: |
Wed, 24 Feb 2021 19:24:50 +0100 |
From: Hannes Reinecke <hare@suse.de>
We really should make a distinction between legitimate sense codes
(ie if one is running against an emulated block device or for
pass-through sense codes), and the intermediate errors generated
during processing of the command, which really are not sense codes
but refer to some specific internal status. And this internal
state is not necessarily linux-specific, but rather can refer to
the qemu implementation itself.
So rename the linux-only SG_ERR codes to SCSI_HOST codes and make
them available generally.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Message-Id: <20201116184041.60465-5-hare@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/scsi/utils.h | 23 ++++++++++++++++-------
scsi/utils.c | 6 +++---
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/include/scsi/utils.h b/include/scsi/utils.h
index ff7c7091b6..ddb22b56df 100644
--- a/include/scsi/utils.h
+++ b/include/scsi/utils.h
@@ -16,6 +16,22 @@ enum SCSIXferMode {
SCSI_XFER_TO_DEV, /* WRITE, MODE_SELECT, ... */
};
+enum SCSIHostStatus {
+ SCSI_HOST_OK,
+ SCSI_HOST_NO_LUN,
+ SCSI_HOST_BUSY,
+ SCSI_HOST_TIME_OUT,
+ SCSI_HOST_BAD_RESPONSE,
+ SCSI_HOST_ABORTED,
+ SCSI_HOST_ERROR = 0x07,
+ SCSI_HOST_RESET = 0x08,
+ SCSI_HOST_TRANSPORT_DISRUPTED = 0xe,
+ SCSI_HOST_TARGET_FAILURE = 0x10,
+ SCSI_HOST_RESERVATION_ERROR = 0x11,
+ SCSI_HOST_ALLOCATION_FAILURE = 0x12,
+ SCSI_HOST_MEDIUM_ERROR = 0x13,
+};
+
typedef struct SCSICommand {
uint8_t buf[SCSI_CMD_BUF_SIZE];
int len;
@@ -124,13 +140,6 @@ int scsi_cdb_length(uint8_t *buf);
#define SG_ERR_DRIVER_TIMEOUT 0x06
#define SG_ERR_DRIVER_SENSE 0x08
-#define SG_ERR_DID_OK 0x00
-#define SG_ERR_DID_NO_CONNECT 0x01
-#define SG_ERR_DID_BUS_BUSY 0x02
-#define SG_ERR_DID_TIME_OUT 0x03
-
-#define SG_ERR_DRIVER_SENSE 0x08
-
int sg_io_sense_from_errno(int errno_value, struct sg_io_hdr *io_hdr,
SCSISense *sense);
#endif
diff --git a/scsi/utils.c b/scsi/utils.c
index 6b56e01002..4d994b6d56 100644
--- a/scsi/utils.c
+++ b/scsi/utils.c
@@ -612,9 +612,9 @@ int sg_io_sense_from_errno(int errno_value, struct
sg_io_hdr *io_hdr,
if (errno_value != 0) {
return scsi_sense_from_errno(errno_value, sense);
} else {
- if (io_hdr->host_status == SG_ERR_DID_NO_CONNECT ||
- io_hdr->host_status == SG_ERR_DID_BUS_BUSY ||
- io_hdr->host_status == SG_ERR_DID_TIME_OUT ||
+ if (io_hdr->host_status == SCSI_HOST_NO_LUN ||
+ io_hdr->host_status == SCSI_HOST_BUSY ||
+ io_hdr->host_status == SCSI_HOST_TIME_OUT ||
(io_hdr->driver_status & SG_ERR_DRIVER_TIMEOUT)) {
return BUSY;
} else if (io_hdr->host_status) {
--
2.29.2
- [PATCH 00/11] scsi-generic: error handling overhaul, Paolo Bonzini, 2021/02/24
- [PATCH 02/10] scsi-disk: do not complete requests early for rerror/werror=ignore, Paolo Bonzini, 2021/02/24
- [PATCH 04/10] scsi-disk: pass SCSI status to scsi_handle_rw_error, Paolo Bonzini, 2021/02/24
- [PATCH 03/10] scsi: introduce scsi_sense_from_errno(), Paolo Bonzini, 2021/02/24
- [PATCH 05/10] scsi-disk: pass guest recoverable errors through even for rerror=stop, Paolo Bonzini, 2021/02/24
- [PATCH 07/10] scsi: Rename linux-specific SG_ERR codes to generic SCSI_HOST error codes,
Paolo Bonzini <=
- [PATCH 09/10] scsi: inline sg_io_sense_from_errno() into the callers., Paolo Bonzini, 2021/02/24
- [PATCH 10/10] scsi: move host_status handling into SCSI drivers, Paolo Bonzini, 2021/02/24
- [PATCH 06/10] scsi: drop 'result' argument from command_complete callback, Paolo Bonzini, 2021/02/24
- [PATCH 01/10] scsi-disk: move scsi_handle_rw_error earlier, Paolo Bonzini, 2021/02/24
- [PATCH 08/10] scsi: Add mapping for generic SCSI_HOST status to sense codes, Paolo Bonzini, 2021/02/24
- Re: [PATCH 00/11] scsi-generic: error handling overhaul, Philippe Mathieu-Daudé, 2021/02/24