diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2010-10-25 12:43:22 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-11-04 12:52:16 +0100 |
| commit | 53830c4ddfdcbe37148daf4d3dab8ee20e8776f0 (patch) | |
| tree | 6644961dd743a5f362ed899fb87a861be92bc1bd | |
| parent | c8890a124909a85287dcc1db20975ca32496fcec (diff) | |
| download | qemu-53830c4ddfdcbe37148daf4d3dab8ee20e8776f0.tar.gz qemu-53830c4ddfdcbe37148daf4d3dab8ee20e8776f0.tar.bz2 qemu-53830c4ddfdcbe37148daf4d3dab8ee20e8776f0.zip | |
scsi-disk: Complete failed requests in scsi_disk_emulate_command
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>
| -rw-r--r-- | hw/scsi-disk.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 43a5b59e26..96acfe31b9 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -784,8 +784,9 @@ static int scsi_disk_emulate_read_toc(SCSIRequest *req, uint8_t *outbuf) 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); uint64_t nb_sectors; int buflen = 0; @@ -943,12 +944,12 @@ static int scsi_disk_emulate_command(SCSIRequest *req, uint8_t *outbuf) return buflen; not_ready: - scsi_req_set_status(req, CHECK_CONDITION, NOT_READY); - return 0; + scsi_command_complete(r, CHECK_CONDITION, NOT_READY); + return -1; illegal_request: - scsi_req_set_status(req, CHECK_CONDITION, ILLEGAL_REQUEST); - return 0; + scsi_command_complete(r, CHECK_CONDITION, ILLEGAL_REQUEST); + return -1; } /* 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 VERIFY: case REZERO_UNIT: - rc = scsi_disk_emulate_command(&r->req, outbuf); - if (rc > 0) { - r->iov.iov_len = rc; - } else { - scsi_req_complete(&r->req); - scsi_remove_request(r); + rc = scsi_disk_emulate_command(r, outbuf); + if (rc < 0) { return 0; } + + r->iov.iov_len = rc; break; case READ_6: case READ_10: |