Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 10:25:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi-bus: Use longer sense buffer with scanners

Browse Source 
Scanners can provide additional sense bytes beyond 18 bytes.
VueScan uses 32 bytes alloc length with Request Sense command.

Signed-off-by: Jarkko Lavinen <jarkko.lavinen@iki.fi>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Jarkko Lavinen 2016-06-29 03:11:46 +03:00 committed by Paolo Bonzini
parent 297b044a7f
commit 6959e508c6
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/scsi/scsi-bus.c
View File

@ -461,6 +461,14 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq *r)
return true; return true;
} }
static size_t scsi_sense_len(SCSIRequest *req)
{
if (req->dev->type == TYPE_SCANNER)
return SCSI_SENSE_LEN_SCANNER;
else
return SCSI_SENSE_LEN;
}
static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf) static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf)
{ {
SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req); SCSITargetReq *r = DO_UPCAST(SCSITargetReq, req, req);
@ -477,7 +485,7 @@ static int32_t scsi_target_send_command(SCSIRequest *req, uint8_t *buf)
} }
break; break;
case REQUEST_SENSE: 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, r->len = scsi_device_get_sense(r->req.dev, r->buf,
MIN(req->cmd.xfer, r->buf_len), MIN(req->cmd.xfer, r->buf_len),
(req->cmd.buf[1] & 1) == 0); (req->cmd.buf[1] & 1) == 0);

7
include/hw/scsi/scsi.h
View File

@ -8,9 +8,10 @@
#define MAX_SCSI_DEVS 255 #define MAX_SCSI_DEVS 255
#define SCSI_CMD_BUF_SIZE 16 #define SCSI_CMD_BUF_SIZE 16
#define SCSI_SENSE_LEN 18 #define SCSI_SENSE_LEN 18
#define SCSI_INQUIRY_LEN 36 #define SCSI_SENSE_LEN_SCANNER 32
#define SCSI_INQUIRY_LEN 36
typedef struct SCSIBus SCSIBus; typedef struct SCSIBus SCSIBus;
typedef struct SCSIBusInfo SCSIBusInfo; typedef struct SCSIBusInfo SCSIBusInfo;