From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O6k1l-0006A5-D1 for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:37 -0400 Received: from [140.186.70.92] (port=51466 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6k1j-00069M-Rg for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O6k1i-0002rb-0V for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6734) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O6k1h-0002rG-OD for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:33 -0400 From: Amit Shah Date: Tue, 27 Apr 2010 18:04:09 +0530 Message-Id: <1272371652-23087-16-git-send-email-amit.shah@redhat.com> In-Reply-To: <1272371652-23087-15-git-send-email-amit.shah@redhat.com> References: <1272371652-23087-1-git-send-email-amit.shah@redhat.com> <1272371652-23087-2-git-send-email-amit.shah@redhat.com> <1272371652-23087-3-git-send-email-amit.shah@redhat.com> <1272371652-23087-4-git-send-email-amit.shah@redhat.com> <1272371652-23087-5-git-send-email-amit.shah@redhat.com> <1272371652-23087-6-git-send-email-amit.shah@redhat.com> <1272371652-23087-7-git-send-email-amit.shah@redhat.com> <1272371652-23087-8-git-send-email-amit.shah@redhat.com> <1272371652-23087-9-git-send-email-amit.shah@redhat.com> <1272371652-23087-10-git-send-email-amit.shah@redhat.com> <1272371652-23087-11-git-send-email-amit.shah@redhat.com> <1272371652-23087-12-git-send-email-amit.shah@redhat.com> <1272371652-23087-13-git-send-email-amit.shah@redhat.com> <1272371652-23087-14-git-send-email-amit.shah@redhat.com> <1272371652-23087-15-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH v6 15/18] virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Amit Shah , qemu list , Juan Quintela 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 3053a35..ad44127 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -335,7 +335,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); } qemu_free(buf); virtio_notify(vdev, vq); @@ -379,11 +379,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 */ -- 1.6.2.5