From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 25 Apr 2016 17:15:48 +0000 (-0400)
Subject: daemon: stream: Close stream on send failure
X-Git-Tag: v1.3.5-rc1~451
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7407872a4ddf52c0ee379181400b82cbfde6908;p=thirdparty%2Flibvirt.git

daemon: stream: Close stream on send failure

This is the only place in daemon/stream.c that sets
'stream->closed = true' but neglects to actually abort the stream
and remove the callback, which seems wrong.
---

diff --git a/daemon/stream.c b/daemon/stream.c
index c892dcbe96..f072a17842 100644
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -539,6 +539,9 @@ daemonStreamHandleWriteData(virNetServerClientPtr client,
 
         VIR_INFO("Stream send failed");
         stream->closed = true;
+        virStreamEventRemoveCallback(stream->st);
+        virStreamAbort(stream->st);
+
         return virNetServerProgramSendReplyError(stream->prog,
                                                  client,
                                                  msg,