|
 |
4a2fec |
From f635140407bf6d024045ad18e7a1f8f802690b36 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
Date: Sat, 2 Dec 2017 12:19:42 +0100
|
|
|
4a2fec |
Subject: [PATCH 16/36] scsi: Introduce scsi_sense_buf_to_errno
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
Message-id: <20171202121953.13317-7-pbonzini@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 78082
|
|
|
4a2fec |
O-Subject: [RHEL7.4 qemu-kvm-rhev PATCH 06/17] scsi: Introduce scsi_sense_buf_to_errno
|
|
|
4a2fec |
Bugzilla: 1464908
|
|
|
4a2fec |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
This recognizes the "fixed" and "descriptor" format sense data, extracts
|
|
|
4a2fec |
the sense key/asc/ascq fields then converts them to an errno.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
Message-Id: <20170821141008.19383-4-famz@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit a485b23425c755867d6caa6ab590be4e0473e35a)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
include/scsi/scsi.h | 1 +
|
|
|
4a2fec |
util/scsi.c | 30 ++++++++++++++++++++++++++++++
|
|
|
4a2fec |
2 files changed, 31 insertions(+)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
|
|
|
4a2fec |
index f894ace..fe33038 100644
|
|
|
4a2fec |
--- a/include/scsi/scsi.h
|
|
|
4a2fec |
+++ b/include/scsi/scsi.h
|
|
|
4a2fec |
@@ -15,5 +15,6 @@
|
|
|
4a2fec |
#define QEMU_SCSI_H
|
|
|
4a2fec |
|
|
|
4a2fec |
int scsi_sense_to_errno(int key, int asc, int ascq);
|
|
|
4a2fec |
+int scsi_sense_buf_to_errno(const uint8_t *sense, size_t sense_size);
|
|
|
4a2fec |
|
|
|
4a2fec |
#endif
|
|
|
4a2fec |
diff --git a/util/scsi.c b/util/scsi.c
|
|
|
4a2fec |
index 472eb5b..472293d 100644
|
|
|
4a2fec |
--- a/util/scsi.c
|
|
|
4a2fec |
+++ b/util/scsi.c
|
|
|
4a2fec |
@@ -58,3 +58,33 @@ int scsi_sense_to_errno(int key, int asc, int ascq)
|
|
|
4a2fec |
return EIO;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+int scsi_sense_buf_to_errno(const uint8_t *sense, size_t sense_size)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ int key, asc, ascq;
|
|
|
4a2fec |
+ if (sense_size < 1) {
|
|
|
4a2fec |
+ return EIO;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
+ switch (sense[0]) {
|
|
|
4a2fec |
+ case 0x70: /* Fixed format sense data. */
|
|
|
4a2fec |
+ if (sense_size < 14) {
|
|
|
4a2fec |
+ return EIO;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
+ key = sense[2] & 0xF;
|
|
|
4a2fec |
+ asc = sense[12];
|
|
|
4a2fec |
+ ascq = sense[13];
|
|
|
4a2fec |
+ break;
|
|
|
4a2fec |
+ case 0x72: /* Descriptor format sense data. */
|
|
|
4a2fec |
+ if (sense_size < 4) {
|
|
|
4a2fec |
+ return EIO;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
+ key = sense[1] & 0xF;
|
|
|
4a2fec |
+ asc = sense[2];
|
|
|
4a2fec |
+ ascq = sense[3];
|
|
|
4a2fec |
+ break;
|
|
|
4a2fec |
+ default:
|
|
|
4a2fec |
+ return EIO;
|
|
|
4a2fec |
+ break;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
+ return scsi_sense_to_errno(key, asc, ascq);
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|