]> git.proxmox.com Git - mirror_qemu.git/commit - qemu-char.c
char: fix handling of QIO_CHANNEL_ERR_BLOCK
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 12 Feb 2016 14:46:50 +0000 (14:46 +0000)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 16 Feb 2016 08:27:59 +0000 (09:27 +0100)
commite046fb449947a48e013bf25d806ecb60e5a88319
tree92bb6a5fad8951ec7ed97889322af55cabb122d6
parent837a183f00cfd320fae33bb8d04d440341faa3b1
char: fix handling of QIO_CHANNEL_ERR_BLOCK

If io_channel_send_full gets QIO_CHANNEL_ERR_BLOCK it
and has already sent some of the data, it should return
that amount of data, not EAGAIN, as that would cause
the caller to re-try already sent data.

Unfortunately due to a previous rebase conflict resolution
error, the code for dealing with this was in the wrong
part of the conditional, and so mistakenly ran on other
I/O errors.

This be seen running

   qemu-system-x86_64 -monitor stdio

and entering 'info mtree', when running on a slow console
(eg a slow remote ssh session). The monitor would get into
an indefinite loop writing the same data until it managed
to send it all without getting EAGAIN.

Reported-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1455288410-27046-1-git-send-email-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
qemu-char.c