qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v3] qemu-char: Fix missed data on unix socket
@ 2015-07-17 17:11 pyssling
  2015-07-17 17:28 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: pyssling @ 2015-07-17 17:11 UTC (permalink / raw)
  To: batuzovk, pbonzini, qemu-devel; +Cc: Nils Carlson

From: Nils Carlson <pyssling@ludd.ltu.se>

Commit 812c1057 introduced HUP detection on unix and tcp sockets prior
to a read in tcp_chr_read. This unfortunately broke CloudStack 4.2
which relied on the old behaviour where data on a socket was readable
even if a HUP was present.

A working solution seems to be to simply check for a HUP after
reading all available data, i.e. recv returns a negative value.

Signed-off-by: Nils Carlson <pyssling@ludd.ltu.se>
---
 qemu-char.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/qemu-char.c b/qemu-char.c
index 617e034..f92fcee 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2847,12 +2847,6 @@ static gboolean tcp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
     uint8_t buf[READ_BUF_LEN];
     int len, size;
 
-    if (cond & G_IO_HUP) {
-        /* connection closed */
-        tcp_chr_disconnect(chr);
-        return TRUE;
-    }
-
     if (!s->connected || s->max_size <= 0) {
         return TRUE;
     }
@@ -2860,7 +2854,7 @@ static gboolean tcp_chr_read(GIOChannel *chan, GIOCondition cond, void *opaque)
     if (len > s->max_size)
         len = s->max_size;
     size = tcp_chr_recv(chr, (void *)buf, len);
-    if (size == 0) {
+    if (size == 0 || (size < 0 && (cond & G_IO_HUP))) {
         /* connection closed */
         tcp_chr_disconnect(chr);
     } else if (size > 0) {
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-07-17 17:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-17 17:11 [Qemu-devel] [PATCH v3] qemu-char: Fix missed data on unix socket pyssling
2015-07-17 17:28 ` Paolo Bonzini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).