diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-11-26 15:34:00 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 09:41:37 -0600 |
commit | ed3a34a3c8dcae6f46556ae7e2a667e6c16c8daa (patch) | |
tree | 8cd220129db344fef2e540adff3b87d158880e1e /hw/scsi-disk.c | |
parent | 251882b7e4532cb42fca89412bb6670dcec4158f (diff) |
scsi: move status to SCSIRequest.
Also add and use the scsi_req_complete() helper function for calling the
completion callback.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/scsi-disk.c')
-rw-r--r-- | hw/scsi-disk.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 2fc6cf9ea8..bc8270ce87 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -84,16 +84,19 @@ static SCSIDiskReq *scsi_find_request(SCSIDiskState *s, uint32_t tag) return DO_UPCAST(SCSIDiskReq, req, scsi_req_find(&s->qdev, tag)); } +static void scsi_req_set_status(SCSIRequest *req, int status, int sense_code) +{ + req->status = status; + scsi_dev_set_sense(req->dev, sense_code); +} + /* Helper function for command completion. */ static void scsi_command_complete(SCSIDiskReq *r, int status, int sense) { - SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - uint32_t tag; DPRINTF("Command complete tag=0x%x status=%d sense=%d\n", r->req.tag, status, sense); - scsi_dev_set_sense(&s->qdev, sense); - tag = r->req.tag; - r->req.bus->complete(r->req.bus, SCSI_REASON_DONE, tag, status); + scsi_req_set_status(&r->req, status, sense); + scsi_req_complete(&r->req); scsi_remove_request(r); } |