aboutsummaryrefslogtreecommitdiff
path: root/scsi/qemu-pr-helper.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2017-12-01 18:40:06 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2017-12-20 22:29:26 +0100
commita4a9b6eaf35dbe4bf0e069854945bf5e45fc7eab (patch)
tree9db978a8f4394911b84fc4ac0430f868c048445a /scsi/qemu-pr-helper.c
parent68a9398261ca38979bbc2b7c89ed5bb044ccc9e6 (diff)
downloadqemu-a4a9b6eaf35dbe4bf0e069854945bf5e45fc7eab.zip
qemu-a4a9b6eaf35dbe4bf0e069854945bf5e45fc7eab.tar.gz
qemu-a4a9b6eaf35dbe4bf0e069854945bf5e45fc7eab.tar.bz2
qemu-pr-helper: miscellaneous fixes
1) Return a generic sense if TEST UNIT READY does not provide one; 2) Fix two mistakes in copying from the spec. Cc: qemu-stable@nongnu.org Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scsi/qemu-pr-helper.c')
-rw-r--r--scsi/qemu-pr-helper.c30
1 files changed, 26 insertions, 4 deletions
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index dd97851..9fe615c 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(&paramp, 0, sizeof(paramp));
memcpy(&paramp.key, &param[0], 8);
memcpy(&paramp.sa_key, &param[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(&param[i + 2]);
if (len > 252 || (len & 3) || i + len + 4 > transportid_len) {