diff options
| -rw-r--r-- | hw/scsi-bus.c | 9 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 13 | ||||
| -rw-r--r-- | hw/scsi-generic.c | 18 | ||||
| -rw-r--r-- | hw/scsi.h | 2 |
4 files changed, 27 insertions, 15 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 666ca3c41c..2e4fd3874c 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -132,6 +132,7 @@ SCSIRequest *scsi_req_alloc(size_t size, SCSIDevice *d, uint32_t tag, uint32_t l req->dev = d; req->tag = tag; req->lun = lun; + req->status = -1; QTAILQ_INSERT_TAIL(&d->requests, req, next); return req; } @@ -362,3 +363,11 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf) req->cmd.lba = scsi_req_lba(req); return 0; } + +void scsi_req_complete(SCSIRequest *req) +{ + assert(req->status != -1); + req->bus->complete(req->bus, SCSI_REASON_DONE, + req->tag, + req->status); +} 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); } diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 31bd0669f5..f60ad96d79 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -88,30 +88,28 @@ static void scsi_command_complete(void *opaque, int ret) { SCSIGenericReq *r = (SCSIGenericReq *)opaque; SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, r->req.dev); - uint32_t tag; - int status; s->driver_status = r->io_header.driver_status; if (s->driver_status & SG_ERR_DRIVER_SENSE) s->senselen = r->io_header.sb_len_wr; if (ret != 0) - status = BUSY << 1; + r->req.status = BUSY << 1; else { if (s->driver_status & SG_ERR_DRIVER_TIMEOUT) { - status = BUSY << 1; + r->req.status = BUSY << 1; BADF("Driver Timeout\n"); } else if (r->io_header.status) - status = r->io_header.status; + r->req.status = r->io_header.status; else if (s->driver_status & SG_ERR_DRIVER_SENSE) - status = CHECK_CONDITION << 1; + r->req.status = CHECK_CONDITION << 1; else - status = GOOD << 1; + r->req.status = GOOD << 1; } DPRINTF("Command complete 0x%p tag=0x%x status=%d\n", - r, r->req.tag, status); - tag = r->req.tag; - r->req.bus->complete(r->req.bus, SCSI_REASON_DONE, tag, status); + r, r->req.tag, r->req.status); + + scsi_req_complete(&r->req); scsi_remove_request(r); } @@ -33,6 +33,7 @@ typedef struct SCSIRequest { SCSIDevice *dev; uint32_t tag; uint32_t lun; + uint32_t status; struct { uint8_t buf[SCSI_CMD_BUF_SIZE]; int len; @@ -106,5 +107,6 @@ SCSIRequest *scsi_req_find(SCSIDevice *d, uint32_t tag); void scsi_req_free(SCSIRequest *req); int scsi_req_parse(SCSIRequest *req, uint8_t *buf); +void scsi_req_complete(SCSIRequest *req); #endif |