From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50602)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1aUFaL-0007ZJ-DU
	for qemu-devel@nongnu.org; Fri, 12 Feb 2016 10:24:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1aUFaJ-0006uO-C8
	for qemu-devel@nongnu.org; Fri, 12 Feb 2016 10:24:41 -0500
References: <1455288410-27046-1-git-send-email-berrange@redhat.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <56BDF933.6040208@redhat.com>
Date: Fri, 12 Feb 2016 16:24:35 +0100
MIME-Version: 1.0
In-Reply-To: <1455288410-27046-1-git-send-email-berrange@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] char: fix handling of QIO_CHANNEL_ERR_BLOCK
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Daniel P. Berrange" <berrange@redhat.com>, qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Igor Mammedov <imammedo@redhat.com>



On 12/02/2016 15:46, Daniel P. Berrange wrote:
> 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>
> ---
>  qemu-char.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/qemu-char.c b/qemu-char.c
> index 1b7d5da..c2e24a5 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -896,13 +896,13 @@ static int io_channel_send_full(QIOChannel *ioc,
>              ioc, &iov, 1,
>              fds, nfds, NULL);
>          if (ret == QIO_CHANNEL_ERR_BLOCK) {
> -            errno = EAGAIN;
> -            return -1;
> -        } else if (ret < 0) {
>              if (offset) {
>                  return offset;
>              }
>  
> +            errno = EAGAIN;
> +            return -1;
> +        } else if (ret < 0) {
>              errno = EINVAL;
>              return -1;
>          }
> 

Queued, thanks.

Paolo