From patchwork Wed Mar 31 07:34:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 49095 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 D489BB7C33 for ; Wed, 31 Mar 2010 19:23:22 +1100 (EST) Received: from localhost ([127.0.0.1]:38355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwtBo-0000aI-5O for incoming@patchwork.ozlabs.org; Wed, 31 Mar 2010 04:22:16 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwsTe-0006OQ-OM for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:36:39 -0400 Received: from [140.186.70.92] (port=33324 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwsTZ-0006Lx-EG for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:36:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NwsTX-0007F2-2w for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:36:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31881) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NwsTW-0007Em-Ka for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:36:30 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2V7aTZh022464 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 31 Mar 2010 03:36:29 -0400 Received: from localhost (vpn-235-197.phx2.redhat.com [10.3.235.197]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2V7aRkj007846; Wed, 31 Mar 2010 03:36:28 -0400 From: Amit Shah To: qemu list Date: Wed, 31 Mar 2010 13:04:06 +0530 Message-Id: <1270020848-15526-16-git-send-email-amit.shah@redhat.com> In-Reply-To: <1270020848-15526-15-git-send-email-amit.shah@redhat.com> References: <1270020848-15526-1-git-send-email-amit.shah@redhat.com> <1270020848-15526-2-git-send-email-amit.shah@redhat.com> <1270020848-15526-3-git-send-email-amit.shah@redhat.com> <1270020848-15526-4-git-send-email-amit.shah@redhat.com> <1270020848-15526-5-git-send-email-amit.shah@redhat.com> <1270020848-15526-6-git-send-email-amit.shah@redhat.com> <1270020848-15526-7-git-send-email-amit.shah@redhat.com> <1270020848-15526-8-git-send-email-amit.shah@redhat.com> <1270020848-15526-9-git-send-email-amit.shah@redhat.com> <1270020848-15526-10-git-send-email-amit.shah@redhat.com> <1270020848-15526-11-git-send-email-amit.shah@redhat.com> <1270020848-15526-12-git-send-email-amit.shah@redhat.com> <1270020848-15526-13-git-send-email-amit.shah@redhat.com> <1270020848-15526-14-git-send-email-amit.shah@redhat.com> <1270020848-15526-15-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , "Michael S. Tsirkin" , Gerd Hoffmann , Juan Quintela Subject: [Qemu-devel] [PATCH 15/17] virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse 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 We cannot indicate to the guest how much data was consumed by an app for out_bufs. So we just have to assume the apps will consume all the data that are handed over to them. Fix the virtio api abuse in control_out() and handle_output(). Signed-off-by: Amit Shah --- hw/virtio-console.c | 7 ++----- hw/virtio-serial-bus.c | 6 +++--- hw/virtio-serial.h | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index bbbb6b8..caea11f 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -20,14 +20,11 @@ typedef struct VirtConsole { /* Callback function that's called when the guest sends us data */ -static size_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len) +static void flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len) { VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port); - ssize_t ret; - ret = qemu_chr_write(vcon->chr, buf, len); - - return ret < 0 ? 0 : ret; + qemu_chr_write(vcon->chr, buf, len); } /* Readiness of the guest to accept data on a port */ diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 49a6baa..7ac46f5 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -336,7 +336,7 @@ static void control_out(VirtIODevice *vdev, VirtQueue *vq) copied = iov_to_buf(elem.out_sg, elem.out_num, buf, 0, len); handle_control_message(vser, buf, copied); - virtqueue_push(vq, &elem, copied); + virtqueue_push(vq, &elem, 0); } if (len) { qemu_free(buf); @@ -382,11 +382,11 @@ static void handle_output(VirtIODevice *vdev, VirtQueue *vq) 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); + port->info->have_data(port, buf, ret); qemu_free(buf); next_buf: - virtqueue_push(vq, &elem, ret); + virtqueue_push(vq, &elem, 0); } virtio_notify(vdev, vq); } diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index f023873..62d76a2 100644 --- a/hw/virtio-serial.h +++ b/hw/virtio-serial.h @@ -136,10 +136,10 @@ struct VirtIOSerialPortInfo { /* * Guest wrote some data to the port. This data is handed over to - * the app via this callback. The app should return the number of - * bytes it successfully consumed. + * the app via this callback. The app is supposed to consume all + * the data that is presented to it. */ - size_t (*have_data)(VirtIOSerialPort *port, const uint8_t *buf, size_t len); + void (*have_data)(VirtIOSerialPort *port, const uint8_t *buf, size_t len); }; /* Interface to the virtio-serial bus */