From patchwork Tue Mar 22 15:36:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 87938 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 183CFB6F73 for ; Wed, 23 Mar 2011 02:35:29 +1100 (EST) Received: from localhost ([127.0.0.1]:48230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q23cE-0005vk-54 for incoming@patchwork.ozlabs.org; Tue, 22 Mar 2011 11:35:26 -0400 Received: from [140.186.70.92] (port=54362 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q23b5-0005tU-H5 for qemu-devel@nongnu.org; Tue, 22 Mar 2011 11:34:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q23b4-0008Jx-HT for qemu-devel@nongnu.org; Tue, 22 Mar 2011 11:34:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q23b3-0008JX-Th for qemu-devel@nongnu.org; Tue, 22 Mar 2011 11:34:14 -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.14.4/8.14.4) with ESMTP id p2MFYBS0012525 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Mar 2011 11:34:11 -0400 Received: from shalem.localdomain.com (vpn1-5-207.ams2.redhat.com [10.36.5.207]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2MFYATr019617; Tue, 22 Mar 2011 11:34:10 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Tue, 22 Mar 2011 16:36:55 +0100 Message-Id: <1300808215-5937-1-git-send-email-hdegoede@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. X-Received-From: 209.132.183.28 Cc: Hans de Goede Subject: [Qemu-devel] [PATCH] spice-qemu-char: Fix flow control in client -> guest direction 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 In the old spice-vmc device we used to have: last_out = virtio_serial_write(&svc->port, p, MIN(len, VMC_MAX_HOST_WRITE)); if (last_out > 0) ... Now in the chardev backend we have: last_out = MIN(len, VMC_MAX_HOST_WRITE); qemu_chr_read(scd->chr, p, last_out); if (last_out > 0) { ... Which causes us to no longer detect if the virtio port is not ready to receive data from us. chardev actually has a mechanism to detect this, but it requires a separate call to qemu_chr_can_read, before calling qemu_chr_read (which return void). This patch uses qemu_chr_can_read to fix the flow control from client to guest. Signed-off-by: Hans de Goede --- spice-qemu-char.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index fa15a71..605c241 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -36,14 +36,13 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len) while (len > 0) { last_out = MIN(len, VMC_MAX_HOST_WRITE); - qemu_chr_read(scd->chr, p, last_out); - if (last_out > 0) { - out += last_out; - len -= last_out; - p += last_out; - } else { + if (qemu_chr_can_read(scd->chr) < last_out) { break; } + qemu_chr_read(scd->chr, p, last_out); + out += last_out; + len -= last_out; + p += last_out; } dprintf(scd, 3, "%s: %lu/%zd\n", __func__, out, len + out);