From patchwork Wed Mar 24 14:49:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 48434 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5870EB7CB6 for ; Thu, 25 Mar 2010 02:24:15 +1100 (EST) Received: from localhost ([127.0.0.1]:54276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuSQj-00068i-Ih for incoming@patchwork.ozlabs.org; Wed, 24 Mar 2010 11:23:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuRvy-0001vq-2j for qemu-devel@nongnu.org; Wed, 24 Mar 2010 10:51:50 -0400 Received: from [140.186.70.92] (port=32796 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuRvw-0001uv-JS for qemu-devel@nongnu.org; Wed, 24 Mar 2010 10:51:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuRvv-0006YF-7U for qemu-devel@nongnu.org; Wed, 24 Mar 2010 10:51:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5637) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuRvu-0006Y5-R8 for qemu-devel@nongnu.org; Wed, 24 Mar 2010 10:51:47 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2OEpkw6020977 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Mar 2010 10:51:46 -0400 Received: from localhost (vpn-11-150.rdu.redhat.com [10.11.11.150]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2OEphPG018319; Wed, 24 Mar 2010 10:51:44 -0400 From: Amit Shah To: qemu list Date: Wed, 24 Mar 2010 20:19:33 +0530 Message-Id: <1269442173-18421-16-git-send-email-amit.shah@redhat.com> In-Reply-To: <1269442173-18421-15-git-send-email-amit.shah@redhat.com> References: <1269442173-18421-1-git-send-email-amit.shah@redhat.com> <1269442173-18421-2-git-send-email-amit.shah@redhat.com> <1269442173-18421-3-git-send-email-amit.shah@redhat.com> <1269442173-18421-4-git-send-email-amit.shah@redhat.com> <1269442173-18421-5-git-send-email-amit.shah@redhat.com> <1269442173-18421-6-git-send-email-amit.shah@redhat.com> <1269442173-18421-7-git-send-email-amit.shah@redhat.com> <1269442173-18421-8-git-send-email-amit.shah@redhat.com> <1269442173-18421-9-git-send-email-amit.shah@redhat.com> <1269442173-18421-10-git-send-email-amit.shah@redhat.com> <1269442173-18421-11-git-send-email-amit.shah@redhat.com> <1269442173-18421-12-git-send-email-amit.shah@redhat.com> <1269442173-18421-13-git-send-email-amit.shah@redhat.com> <1269442173-18421-14-git-send-email-amit.shah@redhat.com> <1269442173-18421-15-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , Avi Kivity , Juan Quintela , Gerd Hoffmann , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 15/15] virtio-serial: Handle scatter/gather input from the guest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Current guests don't send more than one iov but it can change later. Ensure we handle that case. Signed-off-by: Amit Shah CC: Avi Kivity --- hw/virtio-serial-bus.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 3edfeca..42e4ed0 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -369,7 +369,8 @@ static void handle_output(VirtIODevice *vdev, VirtQueue *vq) while (virtqueue_pop(vq, &elem)) { VirtIOSerialPort *port; - size_t ret; + uint8_t *buf; + size_t ret, buf_size; port = find_port_by_vq(vser, vq); if (!port) { @@ -392,9 +393,12 @@ static void handle_output(VirtIODevice *vdev, VirtQueue *vq) goto next_buf; } - /* The guest always sends only one sg */ - ret = port->info->have_data(port, elem.out_sg[0].iov_base, - elem.out_sg[0].iov_len); + buf_size = iov_size(elem.out_sg, elem.out_num); + buf = qemu_malloc(buf_size); + ret = iov_to_buf(elem.out_sg, elem.out_num, buf, 0, buf_size); + + ret = port->info->have_data(port, buf, ret); + qemu_free(buf); next_buf: virtqueue_push(vq, &elem, ret);