From 28805f3d86dcfdc5227e04834d2b544d153e7d88 Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Thu, 6 Dec 2018 12:33:20 -0500
Subject: [PATCH] remote: Use consistent error preservation and restoration
 calls

Provide some consistency over error message variable name and usage
when saving error messages across possible other errors or possibility
of resetting of the last error.

Instead of virSaveLastError paired up with virSetError and virFreeError,
we should use the newer virErrorPreserveLast and virRestoreError.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/remote/remote_daemon_stream.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c
index d7fcb1bf42..c4f14a27ef 100644
--- a/src/remote/remote_daemon_stream.c
+++ b/src/remote/remote_daemon_stream.c
@@ -229,15 +229,18 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque)
         int ret;
         virNetMessagePtr msg;
         virNetMessageError rerr;
-        virErrorPtr origErr = virSaveLastError();
+        virErrorPtr origErr;
+
+        virErrorPreserveLast(&origErr);
 
         memset(&rerr, 0, sizeof(rerr));
         stream->closed = true;
         virStreamEventRemoveCallback(stream->st);
         virStreamAbort(stream->st);
         if (origErr && origErr->code != VIR_ERR_OK) {
-            virSetError(origErr);
+            virErrorRestore(&origErr);
         } else {
+            virFreeError(origErr);
             if (events & VIR_STREAM_EVENT_HANGUP)
                 virReportError(VIR_ERR_RPC,
                                "%s", _("stream had unexpected termination"));
@@ -245,7 +248,6 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque)
                 virReportError(VIR_ERR_RPC,
                                "%s", _("stream had I/O failure"));
         }
-        virFreeError(origErr);
 
         msg = virNetMessageNew(false);
         if (!msg) {
@@ -549,7 +551,9 @@ daemonStreamHandleWriteData(virNetServerClientPtr client,
         return 1;
     } else if (ret < 0) {
         virNetMessageError rerr;
-        virErrorPtr err = virSaveLastError();
+        virErrorPtr err;
+
+        virErrorPreserveLast(&err);
 
         memset(&rerr, 0, sizeof(rerr));
 
@@ -558,10 +562,7 @@ daemonStreamHandleWriteData(virNetServerClientPtr client,
         virStreamEventRemoveCallback(stream->st);
         virStreamAbort(stream->st);
 
-        if (err) {
-            virSetError(err);
-            virFreeError(err);
-        }
+        virErrorRestore(&err);
 
         return virNetServerProgramSendReplyError(stream->prog,
                                                  client,