From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGqO-0004V2-PX for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:25:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgGqI-00011s-LX for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:25:04 -0500 Received: from mail-ee0-f45.google.com ([74.125.83.45]:38854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgGhQ-0007kM-V6 for qemu-devel@nongnu.org; Wed, 05 Dec 2012 10:15:49 -0500 Received: by mail-ee0-f45.google.com with SMTP id d49so3171348eek.4 for ; Wed, 05 Dec 2012 07:15:47 -0800 (PST) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" Date: Wed, 5 Dec 2012 16:15:32 +0100 Message-Id: <1354720537-12097-1-git-send-email-marcandre.lureau@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] spice-qemu-char: write to chardev whatever amount it can read List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , alevy@redhat.com, kraxel@redhat.com The current code waits until the chardev can read MIN(len, VMC_MAX) But some chardev may never reach than amount, in fact some of them will only ever accept write of 1. Fix the min computation and remove the VMC_MAX constant. --- spice-qemu-char.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 09aa22d..665efd3 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -14,8 +14,6 @@ } \ } while (0) -#define VMC_MAX_HOST_WRITE 2048 - typedef struct SpiceCharDriver { CharDriverState* chr; SpiceCharDeviceInstance sin; @@ -35,8 +33,8 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len) uint8_t* p = (uint8_t*)buf; while (len > 0) { - last_out = MIN(len, VMC_MAX_HOST_WRITE); - if (qemu_chr_be_can_write(scd->chr) < last_out) { + last_out = MIN(len, qemu_chr_be_can_write(scd->chr)); + if (last_out <= 0) { break; } qemu_chr_be_write(scd->chr, p, last_out); -- 1.7.11.7