diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:15:11 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-06-08 12:15:11 -0500 |
| commit | ac779fe2334ebea5d4a365b053d786f7748a1db5 (patch) | |
| tree | 5459fe587195dcb74b3b2ca19dc2d4a39a9fb31e /spice-qemu-char.c | |
| parent | 13748cf499fbd93468e7103c0866e073a666f270 (diff) | |
| parent | 212496c98219df17913f3157a7bf85575b32384f (diff) | |
| download | focaccia-qemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.tar.gz focaccia-qemu-ac779fe2334ebea5d4a365b053d786f7748a1db5.zip | |
Merge remote-tracking branch 'spice/spice.v37' into staging
Conflicts: vl.c
Diffstat (limited to 'spice-qemu-char.c')
| -rw-r--r-- | 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 fa15a71e14..605c241239 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); |