|
 |
4a2fec |
From 671df2c5697b3509eb8a9e16e3b2ccc51f9719d7 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
Date: Sat, 2 Dec 2017 12:19:45 +0100
|
|
|
4a2fec |
Subject: [PATCH 19/36] scsi: introduce scsi_build_sense
|
|
|
4a2fec |
MIME-Version: 1.0
|
|
|
4a2fec |
Content-Type: text/plain; charset=UTF-8
|
|
|
4a2fec |
Content-Transfer-Encoding: 8bit
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
Message-id: <20171202121953.13317-10-pbonzini@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 78078
|
|
|
4a2fec |
O-Subject: [RHEL7.4 qemu-kvm-rhev PATCH 09/17] scsi: introduce scsi_build_sense
|
|
|
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 |
Move more knowledge of sense data format out of hw/scsi/scsi-bus.c
|
|
|
4a2fec |
for reusability.
|
|
|
4a2fec |
|
|
|
4a2fec |
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
|
4a2fec |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit a3760467c6b0ff5d1ff952fdc8cec69c65e19499)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/scsi/scsi-bus.c | 8 +-------
|
|
|
4a2fec |
include/scsi/utils.h | 2 ++
|
|
|
4a2fec |
scsi/utils.c | 11 +++++++++++
|
|
|
4a2fec |
3 files changed, 14 insertions(+), 7 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
|
|
|
4a2fec |
index 635cdf6..f77e576 100644
|
|
|
4a2fec |
--- a/hw/scsi/scsi-bus.c
|
|
|
4a2fec |
+++ b/hw/scsi/scsi-bus.c
|
|
|
4a2fec |
@@ -826,13 +826,7 @@ void scsi_req_build_sense(SCSIRequest *req, SCSISense sense)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
trace_scsi_req_build_sense(req->dev->id, req->lun, req->tag,
|
|
|
4a2fec |
sense.key, sense.asc, sense.ascq);
|
|
|
4a2fec |
- memset(req->sense, 0, 18);
|
|
|
4a2fec |
- req->sense[0] = 0x70;
|
|
|
4a2fec |
- req->sense[2] = sense.key;
|
|
|
4a2fec |
- req->sense[7] = 10;
|
|
|
4a2fec |
- req->sense[12] = sense.asc;
|
|
|
4a2fec |
- req->sense[13] = sense.ascq;
|
|
|
4a2fec |
- req->sense_len = 18;
|
|
|
4a2fec |
+ req->sense_len = scsi_build_sense(req->sense, sense);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static void scsi_req_enqueue_internal(SCSIRequest *req)
|
|
|
4a2fec |
diff --git a/include/scsi/utils.h b/include/scsi/utils.h
|
|
|
4a2fec |
index 90bf4dc..b49392d 100644
|
|
|
4a2fec |
--- a/include/scsi/utils.h
|
|
|
4a2fec |
+++ b/include/scsi/utils.h
|
|
|
4a2fec |
@@ -30,6 +30,8 @@ typedef struct SCSISense {
|
|
|
4a2fec |
uint8_t ascq;
|
|
|
4a2fec |
} SCSISense;
|
|
|
4a2fec |
|
|
|
4a2fec |
+int scsi_build_sense(uint8_t *buf, SCSISense sense);
|
|
|
4a2fec |
+
|
|
|
4a2fec |
/*
|
|
|
4a2fec |
* Predefined sense codes
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
diff --git a/scsi/utils.c b/scsi/utils.c
|
|
|
4a2fec |
index 2327e06..89d9167 100644
|
|
|
4a2fec |
--- a/scsi/utils.c
|
|
|
4a2fec |
+++ b/scsi/utils.c
|
|
|
4a2fec |
@@ -96,6 +96,17 @@ int scsi_cdb_length(uint8_t *buf)
|
|
|
4a2fec |
return cdb_len;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+int scsi_build_sense(uint8_t *buf, SCSISense sense)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ memset(buf, 0, 18);
|
|
|
4a2fec |
+ buf[0] = 0x70;
|
|
|
4a2fec |
+ buf[2] = sense.key;
|
|
|
4a2fec |
+ buf[7] = 10;
|
|
|
4a2fec |
+ buf[12] = sense.asc;
|
|
|
4a2fec |
+ buf[13] = sense.ascq;
|
|
|
4a2fec |
+ return 18;
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
/*
|
|
|
4a2fec |
* Predefined sense codes
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|