From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAL8g-0000Or-15 for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:22 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAL8Z-0000Jt-5j for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:20 -0500 Received: from [199.232.76.173] (port=58259 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAL8Y-0000Jc-5A for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60396) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAL8X-0006yM-Il for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:13 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHAICV8019705 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 05:18:12 -0500 From: Gerd Hoffmann Date: Tue, 17 Nov 2009 11:17:50 +0100 Message-Id: <1258453071-3496-15-git-send-email-kraxel@redhat.com> In-Reply-To: <1258453071-3496-1-git-send-email-kraxel@redhat.com> References: <1258453071-3496-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 14/15] scsi: move status to SCSIRequest. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Also add and use the scsi_req_complete() helper function for calling the completion callback. Signed-off-by: Gerd Hoffmann --- 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 493e220..edfe099 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -131,6 +131,7 @@ void scsi_req_init(SCSIRequest *req, SCSIDevice *d, uint32_t tag, uint32_t lun) req->lun = lun; req->aiocb = NULL; memset(&req->cmd, 0, sizeof(req->cmd)); + req->status = -1; } static int scsi_req_length(SCSIRequest *req, uint8_t *cmd) @@ -341,3 +342,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 e072226..bc0fc31 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -103,17 +103,20 @@ static SCSIDiskReq *scsi_find_request(SCSIDiskState *s, uint32_t tag) return NULL; } +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; + scsi_req_set_status(&r->req, status, sense); + scsi_req_complete(&r->req); scsi_remove_request(r); - r->req.bus->complete(r->req.bus, SCSI_REASON_DONE, tag, status); } /* Cancel a pending data transfer. */ diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 150bd93..557b833 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -110,31 +110,29 @@ 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, r->req.tag, r->req.status); + + scsi_req_complete(&r->req); scsi_remove_request(r); - r->req.bus->complete(r->req.bus, SCSI_REASON_DONE, tag, status); } /* Cancel a pending data transfer. */ diff --git a/hw/scsi.h b/hw/scsi.h index cb85864..370932b 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; @@ -103,5 +104,6 @@ void scsi_dev_set_sense(SCSIDevice *dev, uint8_t key); void scsi_req_init(SCSIRequest *req, SCSIDevice *d, uint32_t tag, uint32_t lun); int scsi_req_parse(SCSIRequest *req, uint8_t *buf); +void scsi_req_complete(SCSIRequest *req); #endif -- 1.6.2.5