[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/54] qemu-pr-helper: miscellaneous fixes
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 05/54] qemu-pr-helper: miscellaneous fixes |
Date: |
Tue, 6 Feb 2018 13:14:26 -0600 |
From: Paolo Bonzini <address@hidden>
1) Return a generic sense if TEST UNIT READY does not provide one;
2) Fix two mistakes in copying from the spec.
Cc: address@hidden
Reported-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
(cherry picked from commit a4a9b6eaf35dbe4bf0e069854945bf5e45fc7eab)
Signed-off-by: Michael Roth <address@hidden>
---
include/scsi/utils.h | 6 +++++-
scsi/qemu-pr-helper.c | 30 ++++++++++++++++++++++++++----
scsi/utils.c | 10 ++++++++++
3 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/include/scsi/utils.h b/include/scsi/utils.h
index 00a4bdb080..eb07e474ee 100644
--- a/include/scsi/utils.h
+++ b/include/scsi/utils.h
@@ -76,7 +76,11 @@ extern const struct SCSISense sense_code_LUN_FAILURE;
extern const struct SCSISense sense_code_LUN_COMM_FAILURE;
/* Command aborted, Overlapped Commands Attempted */
extern const struct SCSISense sense_code_OVERLAPPED_COMMANDS;
-/* LUN not ready, Capacity data has changed */
+/* Medium error, Unrecovered read error */
+extern const struct SCSISense sense_code_READ_ERROR;
+/* LUN not ready, Cause not reportable */
+extern const struct SCSISense sense_code_NOT_READY;
+/* Unit attention, Capacity data has changed */
extern const struct SCSISense sense_code_CAPACITY_CHANGED;
/* Unit attention, SCSI bus reset */
extern const struct SCSISense sense_code_SCSI_BUS_RESET;
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index dd9785143b..9fe615c73c 100644
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -314,6 +314,22 @@ static int is_mpath(int fd)
return !strncmp(tgt->target_type, "multipath", DM_MAX_TYPE_NAME);
}
+static SCSISense mpath_generic_sense(int r)
+{
+ switch (r) {
+ case MPATH_PR_SENSE_NOT_READY:
+ return SENSE_CODE(NOT_READY);
+ case MPATH_PR_SENSE_MEDIUM_ERROR:
+ return SENSE_CODE(READ_ERROR);
+ case MPATH_PR_SENSE_HARDWARE_ERROR:
+ return SENSE_CODE(TARGET_FAILURE);
+ case MPATH_PR_SENSE_ABORTED_COMMAND:
+ return SENSE_CODE(IO_ERROR);
+ default:
+ abort();
+ }
+}
+
static int mpath_reconstruct_sense(int fd, int r, uint8_t *sense)
{
switch (r) {
@@ -329,7 +345,13 @@ static int mpath_reconstruct_sense(int fd, int r, uint8_t
*sense)
*/
uint8_t cdb[6] = { TEST_UNIT_READY };
int sz = 0;
- return do_sgio(fd, cdb, sense, NULL, &sz, SG_DXFER_NONE);
+ int r = do_sgio(fd, cdb, sense, NULL, &sz, SG_DXFER_NONE);
+
+ if (r != GOOD) {
+ return r;
+ }
+ scsi_build_sense(sense, mpath_generic_sense(r));
+ return CHECK_CONDITION;
}
case MPATH_PR_SENSE_UNIT_ATTENTION:
@@ -449,7 +471,7 @@ static int multipath_pr_out(int fd, const uint8_t *cdb,
uint8_t *sense,
memset(¶mp, 0, sizeof(paramp));
memcpy(¶mp.key, ¶m[0], 8);
memcpy(¶mp.sa_key, ¶m[8], 8);
- paramp.sa_flags = param[10];
+ paramp.sa_flags = param[20];
if (sz > PR_OUT_FIXED_PARAM_SIZE) {
size_t transportid_len;
int i, j;
@@ -478,8 +500,8 @@ static int multipath_pr_out(int fd, const uint8_t *cdb,
uint8_t *sense,
j += offsetof(struct transportid, n_port_name[8]);
i += 24;
break;
- case 3:
- case 0x43:
+ case 5:
+ case 0x45:
/* iSCSI transport. */
len = lduw_be_p(¶m[i + 2]);
if (len > 252 || (len & 3) || i + len + 4 > transportid_len) {
diff --git a/scsi/utils.c b/scsi/utils.c
index 5684951b12..e4182a9b09 100644
--- a/scsi/utils.c
+++ b/scsi/utils.c
@@ -211,6 +211,16 @@ const struct SCSISense sense_code_LUN_COMM_FAILURE = {
.key = ABORTED_COMMAND, .asc = 0x08, .ascq = 0x00
};
+/* Medium Error, Unrecovered read error */
+const struct SCSISense sense_code_READ_ERROR = {
+ .key = MEDIUM_ERROR, .asc = 0x11, .ascq = 0x00
+};
+
+/* Not ready, Cause not reportable */
+const struct SCSISense sense_code_NOT_READY = {
+ .key = NOT_READY, .asc = 0x04, .ascq = 0x00
+};
+
/* Unit attention, Capacity data has changed */
const struct SCSISense sense_code_CAPACITY_CHANGED = {
.key = UNIT_ATTENTION, .asc = 0x2a, .ascq = 0x09
--
2.11.0
- [Qemu-devel] [PATCH 07/54] block: Make bdrv_drain_invoke() recursive, (continued)
- [Qemu-devel] [PATCH 07/54] block: Make bdrv_drain_invoke() recursive, Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 39/54] spapr: Treat Hardware Transactional Memory (HTM) as an optional capability, Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 44/54] hw/ppc/spapr_caps: Rework spapr_caps to use uint8 internal representation, Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 46/54] spapr: fix device tree properties when using compatibility mode, Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 48/54] target/ppc/spapr_caps: Add macro to generate spapr_caps migration vmstate, Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 04/54] qemu-options: Remove stray colons from output of --help, Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 49/54] target/ppc/kvm: Add cap_ppc_safe_[cache/bounds_check/indirect_branch], Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 53/54] target/ppc/spapr_caps: Add new tristate cap safe_indirect_branch, Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 06/54] block/nbd: fix segmentation fault when .desc is not null-terminated, Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 08/54] block: Call .drain_begin only once in bdrv_drain_all_begin(), Michael Roth, 2018/02/06
- [Qemu-devel] [PATCH 05/54] qemu-pr-helper: miscellaneous fixes,
Michael Roth <=
- Re: [Qemu-devel] [PATCH 00/54] Patch Round-up for stable 2.11.1, freeze on 2018-02-12, Thomas Huth, 2018/02/07
- Re: [Qemu-devel] [PATCH 00/54] Patch Round-up for stable 2.11.1, freeze on 2018-02-12, Cornelia Huck, 2018/02/07
- Re: [Qemu-devel] [Qemu-stable] [PATCH 00/54] Patch Round-up for stable 2.11.1, freeze on 2018-02-12, Greg Kurz, 2018/02/07
- Re: [Qemu-devel] [Qemu-stable] [PATCH 00/54] Patch Round-up for stable 2.11.1, freeze on 2018-02-12, Peter Lieven, 2018/02/08
- Re: [Qemu-devel] [PATCH 00/54] Patch Round-up for stable 2.11.1, freeze on 2018-02-12, Philippe Mathieu-Daudé, 2018/02/08
- [Qemu-devel] [PATCH 10/54] vfio: Fix vfio-kvm group registration, Michael Roth, 2018/02/08