qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hans de Goede <hdegoede@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 1/7] spice-qemu-char: Fix flow control in client -> guest direction
Date: Mon,  6 Jun 2011 14:49:34 +0200	[thread overview]
Message-ID: <1307364580-28385-2-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1307364580-28385-1-git-send-email-kraxel@redhat.com>

From: Hans de Goede <hdegoede@redhat.com>

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 <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 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);
-- 
1.7.1

  reply	other threads:[~2011-06-06 12:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-06 12:49 [Qemu-devel] [PULL] spice patch queue Gerd Hoffmann
2011-06-06 12:49 ` Gerd Hoffmann [this message]
2011-06-06 12:49 ` [Qemu-devel] [PATCH 2/7] spice: add option for disabling copy paste support Gerd Hoffmann
2011-06-06 12:49 ` [Qemu-devel] [PATCH 3/7] qxl: add to the list of devices which disable the default vga Gerd Hoffmann
2011-06-06 12:49 ` [Qemu-devel] [PATCH 4/7] spice: add SASL support Gerd Hoffmann
2011-06-06 12:49 ` [Qemu-devel] [PATCH 5/7] qemu-config: comment spell fix Gerd Hoffmann
2011-06-06 12:49 ` [Qemu-devel] [PATCH 6/7] spice: require spice 0.6.0 or newer Gerd Hoffmann
2011-06-06 12:49 ` [Qemu-devel] [PATCH 7/7] qxl: fix cmdlog for vga Gerd Hoffmann
2011-06-09 12:39 ` [Qemu-devel] [PULL] spice patch queue Anthony Liguori
2011-06-09 12:41 ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1307364580-28385-2-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=hdegoede@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).