From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 6 Jul 2017 17:03:53 +0000 (+0200)
Subject: chardev: block during sync read
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bcdeb9be566ded2eb35233aaccf38742a21e5daa;p=qemu.git

chardev: block during sync read

A sync read should block until all requested data is
available (instead of retrying in qemu_chr_fe_read_all). Change the
channel to blocking during sync_read.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170706170353.32601-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index ccc499cfa1..7e6648b03a 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -454,7 +454,9 @@ static int tcp_chr_sync_read(Chardev *chr, const uint8_t *buf, int len)
         return 0;
     }
 
+    qio_channel_set_blocking(s->ioc, true, NULL);
     size = tcp_chr_recv(chr, (void *) buf, len);
+    qio_channel_set_blocking(s->ioc, false, NULL);
     if (size == 0) {
         /* connection closed */
         tcp_chr_disconnect(chr);