From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLwjo-00043E-49 for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QLwjn-0000Eo-5D for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:28 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLwjn-00007r-19 for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:27 -0400 Received: by mail-ww0-f53.google.com with SMTP id 40so4444155wwj.10 for ; Mon, 16 May 2011 05:17:26 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 16 May 2011 14:16:27 +0200 Message-Id: <1305548197-16196-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1305548197-16196-1-git-send-email-pbonzini@redhat.com> References: <1305548197-16196-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/21] scsi: use scsi_req_complete List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- hw/scsi-generic.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 5bfbb8a..e1f8a8a 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -288,7 +288,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, req->dev); SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req); - SCSIBus *bus; int ret; scsi_req_enqueue(req); @@ -305,8 +304,8 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) s->sensebuf[6] = 0x00; s->senselen = 7; s->driver_status = SG_ERR_DRIVER_SENSE; - bus = scsi_bus_from_device(&s->qdev); - bus->ops.complete(req, SCSI_REASON_DONE, CHECK_CONDITION); + r->req.status = CHECK_CONDITION; + scsi_req_complete(&r->req); return 0; } -- 1.7.4.4