falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spice-qemu-char: Fix flow control in client -> guest direction 

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>
This commit is contained in:
Hans de Goede 2011-03-22 16:28:41 +01:00 committed by Gerd Hoffmann
parent d800040fb4
commit 35106c2df2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spice-qemu-char.c
View File

@ -36,14 +36,13 @@ static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len)
while (len > 0) { while (len > 0) {
last_out = MIN(len, VMC_MAX_HOST_WRITE); last_out = MIN(len, VMC_MAX_HOST_WRITE);
qemu_chr_read(scd->chr, p, last_out); if (qemu_chr_can_read(scd->chr) < last_out) {
if (last_out > 0) {
out += last_out;
len -= last_out;
p += last_out;
} else {
break; 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); dprintf(scd, 3, "%s: %lu/%zd\n", __func__, out, len + out);