ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: fix WRITE SAME transfer length and direction 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-02-08 10:40:37 +01:00
parent 31e8fd86f2
commit a5ee908562
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/scsi-bus.c
View File

@ -791,7 +791,8 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)
case MODE_SENSE: case MODE_SENSE:
break; break;
case WRITE_SAME_10: case WRITE_SAME_10:
cmd->xfer = 1; case WRITE_SAME_16:
cmd->xfer = dev->blocksize;
break; break;
case READ_CAPACITY_10: case READ_CAPACITY_10:
cmd->xfer = 8; cmd->xfer = 8;
@ -909,6 +910,10 @@ static int scsi_req_stream_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *bu
static void scsi_cmd_xfer_mode(SCSICommand *cmd) static void scsi_cmd_xfer_mode(SCSICommand *cmd)
{ {
if (!cmd->xfer) {
cmd->mode = SCSI_XFER_NONE;
return;
}
switch (cmd->buf[0]) { switch (cmd->buf[0]) {
case WRITE_6: case WRITE_6:
case WRITE_10: case WRITE_10:
@ -934,6 +939,7 @@ static void scsi_cmd_xfer_mode(SCSICommand *cmd)
case UPDATE_BLOCK: case UPDATE_BLOCK:
case WRITE_LONG_10: case WRITE_LONG_10:
case WRITE_SAME_10: case WRITE_SAME_10:
case WRITE_SAME_16:
case SEARCH_HIGH_12: case SEARCH_HIGH_12:
case SEARCH_EQUAL_12: case SEARCH_EQUAL_12:
case SEARCH_LOW_12: case SEARCH_LOW_12:
@ -946,11 +952,7 @@ static void scsi_cmd_xfer_mode(SCSICommand *cmd)
cmd->mode = SCSI_XFER_TO_DEV; cmd->mode = SCSI_XFER_TO_DEV;
break; break;
default: default:
if (cmd->xfer) cmd->mode = SCSI_XFER_FROM_DEV;
cmd->mode = SCSI_XFER_FROM_DEV;
else {
cmd->mode = SCSI_XFER_NONE;
}
break; break;
} }
} }

5
hw/scsi-disk.c
View File

@ -1566,8 +1566,11 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf)
} }
break; break;
case WRITE_SAME_10: case WRITE_SAME_10:
len = lduw_be_p(&buf[7]);
goto write_same;
case WRITE_SAME_16: case WRITE_SAME_16:
len = r->req.cmd.xfer / s->qdev.blocksize; len = ldl_be_p(&buf[10]) & 0xffffffffULL;
write_same:
DPRINTF("WRITE SAME() (sector %" PRId64 ", count %d)\n", DPRINTF("WRITE SAME() (sector %" PRId64 ", count %d)\n",
r->req.cmd.lba, len); r->req.cmd.lba, len);