From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFti-0002mq-88 for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxFtZ-00026m-6t for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:30 -0400 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:35480) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxFtZ-00026a-17 for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:27:21 -0400 Received: by mail-wi0-f179.google.com with SMTP id cc10so1137583wib.0 for ; Wed, 18 Jun 2014 06:27:20 -0700 (PDT) Received: from yakj.station (net-37-117-140-88.cust.vodafonedsl.it. [37.117.140.88]) by mx.google.com with ESMTPSA id l5sm3853238wif.22.2014.06.18.06.27.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jun 2014 06:27:19 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 Jun 2014 15:26:51 +0200 Message-Id: <1403098014-1522-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403098014-1522-1-git-send-email-pbonzini@redhat.com> References: <1403098014-1522-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 11/14] virtio-scsi: add extra argument and return type to qemu_sgl_concat List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Will be used for anylayout support. Signed-off-by: Paolo Bonzini --- hw/scsi/virtio-scsi.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index ec9a536..0718626 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -95,14 +95,27 @@ static void virtio_scsi_bad_req(void) exit(1); } -static void qemu_sgl_concat(VirtIOSCSIReq *req, struct iovec *sg, - hwaddr *addr, int num) +static size_t qemu_sgl_concat(VirtIOSCSIReq *req, struct iovec *iov, + hwaddr *addr, int num, size_t skip) { QEMUSGList *qsgl = &req->qsgl; - - while (num--) { - qemu_sglist_add(qsgl, *(addr++), (sg++)->iov_len); + size_t copied = 0; + + while (num) { + if (skip >= iov->iov_len) { + skip -= iov->iov_len; + } else { + qemu_sglist_add(qsgl, *addr + skip, iov->iov_len - skip); + copied += iov->iov_len - skip; + skip = 0; + } + iov++; + addr++; + num--; } + + assert(skip == 0); + return copied; } static int virtio_scsi_parse_req(VirtIOSCSIReq *req, @@ -127,11 +140,11 @@ static int virtio_scsi_parse_req(VirtIOSCSIReq *req, if (req->elem.out_num > 1) { qemu_sgl_concat(req, &req->elem.out_sg[1], &req->elem.out_addr[1], - req->elem.out_num - 1); + req->elem.out_num - 1, 0); } else { qemu_sgl_concat(req, &req->elem.in_sg[1], &req->elem.in_addr[1], - req->elem.in_num - 1); + req->elem.in_num - 1, 0); } return 0; -- 1.8.3.1