From patchwork Fri Sep 16 14:40:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 114993 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 28F3BB6F81 for ; Sat, 17 Sep 2011 02:44:15 +1000 (EST) Received: from localhost ([::1]:59170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4Zaw-0003dw-Pq for incoming@patchwork.ozlabs.org; Fri, 16 Sep 2011 10:40:46 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZaS-0002Ba-Sv for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:40:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4ZaQ-0000FJ-M1 for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:40:16 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:35476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZaQ-0000EC-GG for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:40:14 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so4650252wwg.10 for ; Fri, 16 Sep 2011 07:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=d1TS4VBxe9UfdeZmt74k7GPmSVlqiIJsDQa+RiuJQN4=; b=jB8seIMXiZVdZbr2geUFJOoyQiAvWaNdyquYW/Ke1MXYoitHPhK+4k49shUlDZuGY8 y43+9R2QYxhm2JnxB2mx1nVo3nU3Ca6emGxoCXVOIT2w3hFMYXEeFtn7/59e3UdqnHI1 gj7yOKlWQf+migG8/tI6KTsgRepJmGFkklvOk= Received: by 10.216.209.223 with SMTP id s73mr828871weo.34.1316184014138; Fri, 16 Sep 2011 07:40:14 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it. [93.34.199.31]) by mx.google.com with ESMTPS id i11sm12750379wbn.25.2011.09.16.07.40.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Sep 2011 07:40:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 16 Sep 2011 16:40:03 +0200 Message-Id: <1316184004-8260-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1316184004-8260-1-git-send-email-pbonzini@redhat.com> References: <1316184004-8260-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [PATCH v2 4/5] scsi-disk: commonize iovec creation between reads and writes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also, consistently use qiov.size instead of iov.iov_len. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 42 ++++++++++++++++++------------------------ 1 files changed, 18 insertions(+), 24 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 8f33249..7654349 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; @@ -124,12 +131,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); } static void scsi_flush_complete(void * opaque, int ret) @@ -180,13 +187,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); bdrv_acct_start(s->bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_READ); r->req.aiocb = bdrv_aio_readv(s->bs, r->sector, &r->qiov, n, scsi_read_complete, r); @@ -235,7 +236,6 @@ static void scsi_write_complete(void * opaque, int ret) { SCSIDiskReq *r = (SCSIDiskReq *)opaque; SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - uint32_t len; uint32_t n; if (r->req.aiocb != NULL) { @@ -249,19 +249,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); } } @@ -280,18 +276,16 @@ 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); - bdrv_acct_start(s->bs, &r->acct, n * BDRV_SECTOR_SIZE, BDRV_ACCT_WRITE); 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); } }