diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-03-18 18:00:41 +0000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-04-05 11:46:52 +0200 |
| commit | 64c800f808748522727847b9cdc73412f22dffb9 (patch) | |
| tree | 7cb3f4764511a0d85d19e1dae392e75dc31c6d20 | |
| parent | 53628efbc8aa7a7ab5354d24b971f4d69452151d (diff) | |
| download | focaccia-qemu-64c800f808748522727847b9cdc73412f22dffb9.tar.gz focaccia-qemu-64c800f808748522727847b9cdc73412f22dffb9.zip | |
char: ensure all clients are in non-blocking mode
Only some callers of tcp_chr_new_client are putting the socket client into non-blocking mode. Move the call to qio_channel_set_blocking() into the tcp_chr_new_client method to guarantee that all code paths set non-blocking mode Reported-by: Andrew Baumann <Andrew.Baumann@microsoft.com> Reported-by: Laurent Vivier <lvivier@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-Id: <1458324041-22709-1-git-send-email-berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | qemu-char.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qemu-char.c b/qemu-char.c index 93fd7333f3..b597ee19ca 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3081,6 +3081,8 @@ static int tcp_chr_new_client(CharDriverState *chr, QIOChannelSocket *sioc) s->sioc = sioc; object_ref(OBJECT(sioc)); + qio_channel_set_blocking(s->ioc, false, NULL); + if (s->do_nodelay) { qio_channel_set_delay(s->ioc, false); } @@ -3112,7 +3114,6 @@ static int tcp_chr_add_client(CharDriverState *chr, int fd) if (!sioc) { return -1; } - qio_channel_set_blocking(QIO_CHANNEL(sioc), false, NULL); ret = tcp_chr_new_client(chr, sioc); object_unref(OBJECT(sioc)); return ret; |