From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwYfj-0006su-Iq for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwYfa-0002cm-9I for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:11 -0400 Received: from mail-wg0-x22b.google.com ([2a00:1450:400c:c00::22b]:48987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwYfa-0002cT-2x for qemu-devel@nongnu.org; Mon, 16 Jun 2014 11:18:02 -0400 Received: by mail-wg0-f43.google.com with SMTP id b13so5619005wgh.26 for ; Mon, 16 Jun 2014 08:18:01 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 16 Jun 2014 17:17:47 +0200 Message-Id: <1402931870-17261-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1402931870-17261-1-git-send-email-pbonzini@redhat.com> References: <1402931870-17261-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/7] 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 Cc: mst@redhat.com 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