From: Martin Kletzander <mkletzan@redhat.com>
Date: Wed, 31 May 2017 14:58:49 +0000 (+0200)
Subject: remote: Consolidate remoteStream{Abort,Finish} functions
X-Git-Tag: v3.5.0-rc1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b151209ea4975a53b29d87491f8eca878b051b0;p=thirdparty%2Flibvirt.git

remote: Consolidate remoteStream{Abort,Finish} functions

They do the same thing with only one difference.  Let's put them
together (like we already do with virFDStreamCloseInt) so that future
changes don't miss one of the implementations.  Also to clean up the
code.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index d27e96ffc2..9c3ec2c87e 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -5846,7 +5846,7 @@ remoteStreamEventRemoveCallback(virStreamPtr st)
 
 
 static int
-remoteStreamFinish(virStreamPtr st)
+remoteStreamCloseInt(virStreamPtr st, bool streamAbort)
 {
     struct private_data *priv = st->conn->privateData;
     virNetClientStreamPtr privst = st->privateData;
@@ -5862,7 +5862,7 @@ remoteStreamFinish(virStreamPtr st)
 
     ret = virNetClientStreamSendPacket(privst,
                                        priv->client,
-                                       VIR_NET_OK,
+                                       streamAbort ? VIR_NET_ERROR : VIR_NET_OK,
                                        NULL,
                                        0);
 
@@ -5881,37 +5881,16 @@ remoteStreamFinish(virStreamPtr st)
 
 
 static int
-remoteStreamAbort(virStreamPtr st)
+remoteStreamFinish(virStreamPtr st)
 {
-    struct private_data *priv = st->conn->privateData;
-    virNetClientStreamPtr privst = st->privateData;
-    int ret = -1;
-
-    remoteDriverLock(priv);
-
-    if (virNetClientStreamRaiseError(privst))
-        goto cleanup;
-
-    priv->localUses++;
-    remoteDriverUnlock(priv);
-
-    ret = virNetClientStreamSendPacket(privst,
-                                       priv->client,
-                                       VIR_NET_ERROR,
-                                       NULL,
-                                       0);
-
-    remoteDriverLock(priv);
-    priv->localUses--;
+    return remoteStreamCloseInt(st, false);
+}
 
- cleanup:
-    virNetClientRemoveStream(priv->client, privst);
-    virObjectUnref(privst);
-    st->privateData = NULL;
-    st->driver = NULL;
 
-    remoteDriverUnlock(priv);
-    return ret;
+static int
+remoteStreamAbort(virStreamPtr st)
+{
+    return remoteStreamCloseInt(st, true);
 }