david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi-disk: Complete failed requests in scsi_disk_emulate_command

Browse Source 
This pulls the request completion for error cases from the caller to
scsi_disk_emulate_command. This should not change semantics, but allows to
reuse scsi_handle_write_error() for flushes in the next patch.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Kevin Wolf 2010-10-25 12:43:22 +02:00
parent 205ef7961f
commit 8af7a3ab51
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/scsi-disk.c
View File

@ -784,8 +784,9 @@ static int scsi_disk_emulate_read_toc(SCSIRequest *req, uint8_t *outbuf)
return toclen; return toclen;
} }
static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf) static int scsi_disk_emulate_command(SCSIDiskReq *r, uint8_t *outbuf)
{ {
SCSIRequest *req = &r->req;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev); SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev);
uint64_t nb_sectors; uint64_t nb_sectors;
int buflen = 0; int buflen = 0;
@ -943,12 +944,12 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf)
return buflen; return buflen;
not_ready: not_ready:
scsi_req_set_status(req, CHECK_CONDITION, NOT_READY); scsi_command_complete(r, CHECK_CONDITION, NOT_READY);
return 0; return -1;
illegal_request: illegal_request:
scsi_req_set_status(req, CHECK_CONDITION, ILLEGAL_REQUEST); scsi_command_complete(r, CHECK_CONDITION, ILLEGAL_REQUEST);
return 0; return -1;
} }
/* Execute a scsi command. Returns the length of the data expected by the /* Execute a scsi command. Returns the length of the data expected by the
@ -1056,14 +1057,12 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
case REPORT_LUNS: case REPORT_LUNS:
case VERIFY: case VERIFY:
case REZERO_UNIT: case REZERO_UNIT:
rc = scsi_disk_emulate_command(&r->req, outbuf); rc = scsi_disk_emulate_command(r, outbuf);
if (rc > 0) { if (rc < 0) {
r->iov.iov_len = rc;
} else {
scsi_req_complete(&r->req);
scsi_remove_request(r);
return 0; return 0;
} }
r->iov.iov_len = rc;
break; break;
case READ_6: case READ_6:
case READ_10: case READ_10: