Re: [Qemu-devel] [PATCH 03/10] scsi: introduce scsi_build_sense

[Philippe Mathieu-Daudé]

On 08/22/2017 10:18 AM, Paolo Bonzini wrote:
> Move more knowledge of sense data format out of hw/scsi/scsi-bus.c
> for reusability.
>
> Signed-off-by: Paolo Bonzini <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>   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 300912d213..f71218f02a 100644
> --- a/hw/scsi/scsi-bus.c
> +++ b/hw/scsi/scsi-bus.c
> @@ -797,13 +797,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 35a74436bf..76c3db98c0 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 0db727591f..54d6d4486a 100644
> --- a/scsi/utils.c
> +++ b/scsi/utils.c
> @@ -81,6 +81,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
>    */