[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/14] scsi: Ensure command and transfer lengths are
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/14] scsi: Ensure command and transfer lengths are set for all SCSI devices |
Date: |
Mon, 2 Jul 2012 11:41:25 +0200 |
scsi-generic relies on those values to be correct, so it is important that
those values are initialized properly for all device types.
Reported-by: Christian Hoff <address@hidden>
Reported-by: Christian Borntraeger <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-bus.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 2d4429c..4ec9b52 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -734,20 +734,16 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice
*dev, uint8_t *buf)
switch (buf[0] >> 5) {
case 0:
cmd->xfer = buf[4];
- cmd->len = 6;
break;
case 1:
case 2:
cmd->xfer = lduw_be_p(&buf[7]);
- cmd->len = 10;
break;
case 4:
cmd->xfer = ldl_be_p(&buf[10]) & 0xffffffffULL;
- cmd->len = 16;
break;
case 5:
cmd->xfer = ldl_be_p(&buf[6]) & 0xffffffffULL;
- cmd->len = 12;
break;
default:
return -1;
@@ -884,7 +880,6 @@ static int scsi_req_stream_length(SCSICommand *cmd,
SCSIDevice *dev, uint8_t *bu
case READ_REVERSE:
case RECOVER_BUFFERED_DATA:
case WRITE_6:
- cmd->len = 6;
cmd->xfer = buf[4] | (buf[3] << 8) | (buf[2] << 16);
if (buf[1] & 0x01) { /* fixed */
cmd->xfer *= dev->blocksize;
@@ -894,7 +889,6 @@ static int scsi_req_stream_length(SCSICommand *cmd,
SCSIDevice *dev, uint8_t *bu
case READ_REVERSE_16:
case VERIFY_16:
case WRITE_16:
- cmd->len = 16;
cmd->xfer = buf[14] | (buf[13] << 8) | (buf[12] << 16);
if (buf[1] & 0x01) { /* fixed */
cmd->xfer *= dev->blocksize;
@@ -902,7 +896,6 @@ static int scsi_req_stream_length(SCSICommand *cmd,
SCSIDevice *dev, uint8_t *bu
break;
case REWIND:
case LOAD_UNLOAD:
- cmd->len = 6;
cmd->xfer = 0;
break;
case SPACE_16:
@@ -1000,6 +993,24 @@ int scsi_req_parse(SCSICommand *cmd, SCSIDevice *dev,
uint8_t *buf)
{
int rc;
+ switch (buf[0] >> 5) {
+ case 0:
+ cmd->len = 6;
+ break;
+ case 1:
+ case 2:
+ cmd->len = 10;
+ break;
+ case 4:
+ cmd->len = 16;
+ break;
+ case 5:
+ cmd->len = 12;
+ break;
+ default:
+ return -1;
+ }
+
if (dev->type == TYPE_TAPE) {
rc = scsi_req_stream_length(cmd, dev, buf);
} else {
--
1.7.10.2
- Re: [Qemu-devel] [PATCH 02/14] scsi: add a qdev property for the disk's WWN, (continued)
- [Qemu-devel] [PATCH 01/14] scsi: simplify handling of the VPD page length field, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 05/14] ISCSI: Add SCSI passthrough via scsi-generic to libiscsi, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 04/14] scsi-disk: implement READ DISC INFORMATION, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 03/14] atapi: implement READ DISC INFORMATION, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 07/14] megasas: Add header file, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 06/14] ISCSI: force use of sg for SMC and SSC devices, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 13/14] scsi: Add basic support for SCSI media changer commands., Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 10/14] scsi: Fix data length == SCSI_SENSE_BUF_SIZE, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 11/14] scsi: Fix LOAD_UNLOAD, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 12/14] scsi: Ensure command and transfer lengths are set for all SCSI devices,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/14] virtio-scsi: do not crash on adding buffers to the event queue, Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 14/14] scsi: Fix transfer length for READ POSITION commands., Paolo Bonzini, 2012/07/02
- [Qemu-devel] [PATCH 08/14] megasas: LSI Megaraid SAS HBA emulation, Paolo Bonzini, 2012/07/02
Re: [Qemu-devel] [PULL 00/14] SCSI updates for 2012-07-02, Anthony Liguori, 2012/07/09