[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/30] scsi: move status to SCSIRequest.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 14/30] scsi: move status to SCSIRequest. |
Date: |
Thu, 26 Nov 2009 15:34:00 +0100 |
Also add and use the scsi_req_complete() helper function for calling the
completion callback.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/scsi-bus.c | 9 +++++++++
hw/scsi-disk.c | 13 ++++++++-----
hw/scsi-generic.c | 18 ++++++++----------
hw/scsi.h | 2 ++
4 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 666ca3c..2e4fd38 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 2fc6cf9..bc8270c 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 613d5a6..c612abf 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);
}
diff --git a/hw/scsi.h b/hw/scsi.h
index 788c459..2fe8c12 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -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
--
1.6.2.5
- [Qemu-devel] [PATCH 00/30] scsi: data structures and cleanups., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 04/30] scsi: move SCSIRequest management to common code., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 03/30] scsi: move request lists to QTAILQ., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 01/30] scsi: add/fix header protection., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 02/30] scsi: create common SCSIRequest structure., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 08/30] scsi: move type from SCSIGenericState to SCSIDevice, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 05/30] scsi: move scsi command buffer from SCSIGenericReq to SCSIRequest., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 12/30] scsi: move sense to SCSIDevice, create SCSISense struct., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 11/30] scsi: add xfer mode, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 14/30] scsi: move status to SCSIRequest.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 10/30] scsi: use command defines in scsi-disk.c, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 06/30] scsi: move blocksize from SCSIGenericState to SCSIDevice, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 09/30] scsi: add request parsing helpers to common code., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 13/30] scsi: move dinfo to SCSIDevice, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 17/30] scsi-disk: restruct emulation: REQUEST_SENSE, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 07/30] scsi: add scsi-defs.h, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 15/30] scsi: add scsi_req_print(), Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 19/30] scsi-disk: restruct emulation: RESERVE+RELEASE, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 27/30] scsi-disk: restruct emulation: SERVICE_ACTION_IN, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 18/30] scsi-disk: restruct emulation: INQUIRY, Gerd Hoffmann, 2009/11/26