From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qp1Vi-0004yH-A7 for qemu-devel@nongnu.org; Thu, 04 Aug 2011 13:15:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qp1Vg-0001Nm-LH for qemu-devel@nongnu.org; Thu, 04 Aug 2011 13:15:05 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:56803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qp1Vg-0001Kh-DO for qemu-devel@nongnu.org; Thu, 04 Aug 2011 13:15:04 -0400 Received: by mail-wy0-f173.google.com with SMTP id 20so1348207wye.4 for ; Thu, 04 Aug 2011 10:15:04 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 4 Aug 2011 19:14:46 +0200 Message-Id: <1312478089-806-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1312478089-806-1-git-send-email-pbonzini@redhat.com> References: <1312478089-806-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/10] scsi-disk: commonize iovec creation between reads and writes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Also, consistently use qiov.size instead of iov.iov_len. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 2cb6ff3..37dd9d6 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -107,6 +107,13 @@ static void scsi_cancel_io(SCSIRequest *req) r->req.aiocb = NULL; } +static uint32_t scsi_init_iovec(SCSIDiskReq *r) +{ + r->iov.iov_len = MIN(r->sector_count * 512, SCSI_DMA_BUF_SIZE); + qemu_iovec_init_external(&r->qiov, &r->iov, 1); + return r->qiov.size / 512; +} + static void scsi_read_complete(void * opaque, int ret) { SCSIDiskReq *r = (SCSIDiskReq *)opaque; @@ -120,12 +127,12 @@ static void scsi_read_complete(void * opaque, int ret) } } - DPRINTF("Data ready tag=0x%x len=%zd\n", r->req.tag, r->iov.iov_len); + DPRINTF("Data ready tag=0x%x len=%zd\n", r->req.tag, r->qiov.size); - n = r->iov.iov_len / 512; + n = r->qiov.size / 512; r->sector += n; r->sector_count -= n; - scsi_req_data(&r->req, r->iov.iov_len); + scsi_req_data(&r->req, r->qiov.size); } @@ -158,12 +165,7 @@ static void scsi_read_data(SCSIRequest *req) return; } - n = r->sector_count; - if (n > SCSI_DMA_BUF_SIZE / 512) - n = SCSI_DMA_BUF_SIZE / 512; - - r->iov.iov_len = n * 512; - qemu_iovec_init_external(&r->qiov, &r->iov, 1); + n = scsi_init_iovec(r); r->req.aiocb = bdrv_aio_readv(s->bs, r->sector, &r->qiov, n, scsi_read_complete, r); if (r->req.aiocb == NULL) { @@ -210,7 +212,6 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type) static void scsi_write_complete(void * opaque, int ret) { SCSIDiskReq *r = (SCSIDiskReq *)opaque; - uint32_t len; uint32_t n; r->req.aiocb = NULL; @@ -221,19 +222,15 @@ static void scsi_write_complete(void * opaque, int ret) } } - n = r->iov.iov_len / 512; + n = r->qiov.size / 512; r->sector += n; r->sector_count -= n; if (r->sector_count == 0) { scsi_req_complete(&r->req, GOOD); } else { - len = r->sector_count * 512; - if (len > SCSI_DMA_BUF_SIZE) { - len = SCSI_DMA_BUF_SIZE; - } - r->iov.iov_len = len; - DPRINTF("Write complete tag=0x%x more=%d\n", r->req.tag, len); - scsi_req_data(&r->req, len); + scsi_init_iovec(r); + DPRINTF("Write complete tag=0x%x more=%d\n", r->req.tag, r->qiov.size); + scsi_req_data(&r->req, r->qiov.size); } } @@ -252,16 +249,15 @@ static void scsi_write_data(SCSIRequest *req) return; } - n = r->iov.iov_len / 512; + n = r->qiov.size / 512; if (n) { - qemu_iovec_init_external(&r->qiov, &r->iov, 1); r->req.aiocb = bdrv_aio_writev(s->bs, r->sector, &r->qiov, n, - scsi_write_complete, r); + scsi_write_complete, r); if (r->req.aiocb == NULL) { scsi_write_complete(r, -ENOMEM); } } else { - /* Invoke completion routine to fetch data from host. */ + /* Called for the first time. Ask the driver to send us more data. */ scsi_write_complete(r, 0); } } -- 1.7.6