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