From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKruz-00067D-QR for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKrut-0004dR-Oe for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKrut-0004cq-Dx for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:43 -0400 From: Kevin Wolf Date: Mon, 31 Oct 2011 14:30:28 +0100 Message-Id: <1320067830-12093-54-git-send-email-kwolf@redhat.com> In-Reply-To: <1320067830-12093-1-git-send-email-kwolf@redhat.com> References: <1320067830-12093-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 53/55] scsi-generic: bump SCSIRequest reference count until aio completion runs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini Same as before, but for scsi-generic. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/scsi-generic.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 2f95f2d..9594cc1 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -113,6 +113,9 @@ static void scsi_command_complete(void *opaque, int ret) r, r->req.tag, status); scsi_req_complete(&r->req, status); + if (!r->req.io_canceled) { + scsi_req_unref(&r->req); + } } /* Cancel a pending data transfer. */ @@ -123,6 +126,11 @@ static void scsi_cancel_io(SCSIRequest *req) DPRINTF("Cancel tag=0x%x\n", req->tag); if (r->req.aiocb) { bdrv_aio_cancel(r->req.aiocb); + + /* This reference was left in by scsi_*_data. We take ownership of + * it independent of whether bdrv_aio_cancel completes the request + * or not. */ + scsi_req_unref(&r->req); } r->req.aiocb = NULL; } @@ -183,6 +191,9 @@ static void scsi_read_complete(void * opaque, int ret) bdrv_set_buffer_alignment(s->conf.bs, s->blocksize); scsi_req_data(&r->req, len); + if (!r->req.io_canceled) { + scsi_req_unref(&r->req); + } } } @@ -194,6 +205,9 @@ static void scsi_read_data(SCSIRequest *req) int ret; DPRINTF("scsi_read_data 0x%x\n", req->tag); + + /* The request is used as the AIO opaque value, so add a ref. */ + scsi_req_ref(&r->req); if (r->len == -1) { scsi_command_complete(r, 0); return; @@ -242,6 +256,8 @@ static void scsi_write_data(SCSIRequest *req) return; } + /* The request is used as the AIO opaque value, so add a ref. */ + scsi_req_ref(&r->req); ret = execute_command(s->conf.bs, r, SG_DXFER_TO_DEV, scsi_write_complete); if (ret < 0) { scsi_command_complete(r, ret); @@ -285,6 +301,8 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) g_free(r->buf); r->buflen = 0; r->buf = NULL; + /* The request is used as the AIO opaque value, so add a ref. */ + scsi_req_ref(&r->req); ret = execute_command(s->conf.bs, r, SG_DXFER_NONE, scsi_command_complete); if (ret < 0) { scsi_command_complete(r, ret); -- 1.7.6.4