|
 |
87abbec |
From eadabcbc81d44ee0bc0d0d80697cc1142df61178 Mon Sep 17 00:00:00 2001
|
|
|
87abbec |
From: Fam Zheng <famz@redhat.com>
|
|
|
87abbec |
Date: Mon, 21 Aug 2017 22:10:07 +0800
|
|
|
87abbec |
Subject: [PATCH 06/15] scsi: Introduce scsi_sense_buf_to_errno
|
|
|
87abbec |
|
|
|
87abbec |
This recognizes the "fixed" and "descriptor" format sense data, extracts
|
|
|
87abbec |
the sense key/asc/ascq fields then converts them to an errno.
|
|
|
87abbec |
|
|
|
87abbec |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
87abbec |
Message-Id: <20170821141008.19383-4-famz@redhat.com>
|
|
|
87abbec |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
87abbec |
---
|
|
|
87abbec |
include/scsi/scsi.h | 1 +
|
|
|
87abbec |
util/scsi.c | 30 ++++++++++++++++++++++++++++++
|
|
|
87abbec |
2 files changed, 31 insertions(+)
|
|
|
87abbec |
|
|
|
87abbec |
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
|
|
|
87abbec |
index f894ace4bf..fe330385d8 100644
|
|
|
87abbec |
--- a/include/scsi/scsi.h
|
|
|
87abbec |
+++ b/include/scsi/scsi.h
|
|
|
87abbec |
@@ -15,5 +15,6 @@
|
|
|
87abbec |
#define QEMU_SCSI_H
|
|
|
87abbec |
|
|
|
87abbec |
int scsi_sense_to_errno(int key, int asc, int ascq);
|
|
|
87abbec |
+int scsi_sense_buf_to_errno(const uint8_t *sense, size_t sense_size);
|
|
|
87abbec |
|
|
|
87abbec |
#endif
|
|
|
87abbec |
diff --git a/util/scsi.c b/util/scsi.c
|
|
|
87abbec |
index 472eb5bea5..472293d59b 100644
|
|
|
87abbec |
--- a/util/scsi.c
|
|
|
87abbec |
+++ b/util/scsi.c
|
|
|
87abbec |
@@ -58,3 +58,33 @@ int scsi_sense_to_errno(int key, int asc, int ascq)
|
|
|
87abbec |
return EIO;
|
|
|
87abbec |
}
|
|
|
87abbec |
}
|
|
|
87abbec |
+
|
|
|
87abbec |
+int scsi_sense_buf_to_errno(const uint8_t *sense, size_t sense_size)
|
|
|
87abbec |
+{
|
|
|
87abbec |
+ int key, asc, ascq;
|
|
|
87abbec |
+ if (sense_size < 1) {
|
|
|
87abbec |
+ return EIO;
|
|
|
87abbec |
+ }
|
|
|
87abbec |
+ switch (sense[0]) {
|
|
|
87abbec |
+ case 0x70: /* Fixed format sense data. */
|
|
|
87abbec |
+ if (sense_size < 14) {
|
|
|
87abbec |
+ return EIO;
|
|
|
87abbec |
+ }
|
|
|
87abbec |
+ key = sense[2] & 0xF;
|
|
|
87abbec |
+ asc = sense[12];
|
|
|
87abbec |
+ ascq = sense[13];
|
|
|
87abbec |
+ break;
|
|
|
87abbec |
+ case 0x72: /* Descriptor format sense data. */
|
|
|
87abbec |
+ if (sense_size < 4) {
|
|
|
87abbec |
+ return EIO;
|
|
|
87abbec |
+ }
|
|
|
87abbec |
+ key = sense[1] & 0xF;
|
|
|
87abbec |
+ asc = sense[2];
|
|
|
87abbec |
+ ascq = sense[3];
|
|
|
87abbec |
+ break;
|
|
|
87abbec |
+ default:
|
|
|
87abbec |
+ return EIO;
|
|
|
87abbec |
+ break;
|
|
|
87abbec |
+ }
|
|
|
87abbec |
+ return scsi_sense_to_errno(key, asc, ascq);
|
|
|
87abbec |
+}
|
|
|
87abbec |
--
|
|
|
87abbec |
2.13.5
|
|
|
87abbec |
|