>From dd85d2aac375db97e860a0908e5bfd5192d0dc61 Mon Sep 17 00:00:00 2001 From: Jarkko Lavinen Date: Wed, 29 Jun 2016 03:11:46 +0300 Subject: [PATCH 2/2] scsi-bus: Use longer sense buffer with scanners Scanners can provide additional sense bytes beyond 18 bytes. VueScan uses 32 bytes alloc length with Request Sense command. Signed-off-by: Jarkko Lavinen --- hw/scsi/scsi-bus.c | 10 +++++++++- include/hw/scsi/scsi.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index e0fbaee..367c5c2 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -461,6 +461,14 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq *r) return true; } +static size_t scsi_sense_len(SCSIRequest *req) +{ + if (req->dev->type == TYPE_SCANNER) + return SCSI_SENSE_LEN_XTRA; + else + return SCSI_SENSE_LEN; +} + static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) { SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req); @@ -477,7 +485,7 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) } break; case REQUEST_SENSE: - scsi_target_alloc_buf(&r->req, SCSI_SENSE_LEN); + scsi_target_alloc_buf(&r->req, scsi_sense_len(req)); r->len = scsi_device_get_sense(r->req.dev, r->buf, MIN(req->cmd.xfer, r->buf_len), (req->cmd.buf[1] & 1) == 0); diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 8acd3fa..76d121d 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -10,6 +10,7 @@ #define SCSI_CMD_BUF_SIZE 16 #define SCSI_SENSE_LEN 18 +#define SCSI_SENSE_LEN_XTRA 32 #define SCSI_INQUIRY_LEN 36 typedef struct SCSIBus SCSIBus; -- 2.1.4