From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 1 Jun 2017 06:40:10 +0000 (+0200)
Subject: virStream*All: Preserve reported error
X-Git-Tag: v3.6.0-rc1~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b62dacb700f2f8694700680261c4e64cf42d95f;p=thirdparty%2Flibvirt.git

virStream*All: Preserve reported error

If one these four functions fail (virStreamRecvAll,
virStreamSendAll, virStreamSparseRecvAll, virStreamSparseSendAll)
the stream is aborted by calling virStreamAbort(). This is  a
public API; therefore, the first thing it does is error reset. At
that point any error that caused us to abort stream in the first
place is gone.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c
index b9125b6649..56e701de8c 100644
--- a/src/libvirt-stream.c
+++ b/src/libvirt-stream.c
@@ -616,7 +616,12 @@ virStreamSendAll(virStreamPtr stream,
     VIR_FREE(bytes);
 
     if (ret != 0) {
+        virErrorPtr orig_err = virSaveLastError();
         virStreamAbort(stream);
+        if (orig_err) {
+            virSetError(orig_err);
+            virFreeError(orig_err);
+        }
         virDispatchError(stream->conn);
     }
 
@@ -771,7 +776,12 @@ int virStreamSparseSendAll(virStreamPtr stream,
     VIR_FREE(bytes);
 
     if (ret != 0) {
+        virErrorPtr orig_err = virSaveLastError();
         virStreamAbort(stream);
+        if (orig_err) {
+            virSetError(orig_err);
+            virFreeError(orig_err);
+        }
         virDispatchError(stream->conn);
     }
 
@@ -865,7 +875,12 @@ virStreamRecvAll(virStreamPtr stream,
     VIR_FREE(bytes);
 
     if (ret != 0) {
+        virErrorPtr orig_err = virSaveLastError();
         virStreamAbort(stream);
+        if (orig_err) {
+            virSetError(orig_err);
+            virFreeError(orig_err);
+        }
         virDispatchError(stream->conn);
     }
 
@@ -985,7 +1000,12 @@ virStreamSparseRecvAll(virStreamPtr stream,
     VIR_FREE(bytes);
 
     if (ret != 0) {
+        virErrorPtr orig_err = virSaveLastError();
         virStreamAbort(stream);
+        if (orig_err) {
+            virSetError(orig_err);
+            virFreeError(orig_err);
+        }
         virDispatchError(stream->conn);
     }