From 82e922c8be1b32eeb0c8c22165cdeff39e12d3ef Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Tue, 22 Aug 2017 09:42:59 +0200

Subject: [PATCH 09/15] scsi: introduce scsi_build_sense

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Move more knowledge of sense data format out of hw/scsi/scsi-bus.c

for reusability.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

---

 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 42920d5422..652ab046ab 100644

--- a/hw/scsi/scsi-bus.c

+++ b/hw/scsi/scsi-bus.c

@@ -818,13 +818,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 90bf4dce6e..b49392d841 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 2327e06da0..89d9167d9d 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

  */

-- 

2.13.5