[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] spice-qemu-char: Fix flow control in client ->
From: |
Gerd Hoffmann |
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 |
From: Hans de Goede <address@hidden>
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PULL] spice patch queue, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 2/7] spice: add option for disabling copy paste support, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 3/7] qxl: add to the list of devices which disable the default vga, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 1/7] spice-qemu-char: Fix flow control in client -> guest direction,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 5/7] qemu-config: comment spell fix, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 7/7] qxl: fix cmdlog for vga, Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 6/7] spice: require spice 0.6.0 or newer., Gerd Hoffmann, 2011/06/06
- [Qemu-devel] [PATCH 4/7] spice: add SASL support, Gerd Hoffmann, 2011/06/06
- Re: [Qemu-devel] [PULL] spice patch queue, Anthony Liguori, 2011/06/09
- Re: [Qemu-devel] [PULL] spice patch queue, Anthony Liguori, 2011/06/09