NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

remote: Consolidate remoteStream{Abort,Finish} functions

Browse Source 
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>
This commit is contained in:
Martin Kletzander 2017-05-31 16:58:49 +02:00
parent 567f04808e
commit 8b151209ea
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/remote/remote_driver.c
View File

@ -5846,7 +5846,7 @@ remoteStreamEventRemoveCallback(virStreamPtr st)
static int static int
remoteStreamFinish(virStreamPtr st) remoteStreamCloseInt(virStreamPtr st, bool streamAbort)
{ {
struct private_data *priv = st->conn->privateData; struct private_data *priv = st->conn->privateData;
virNetClientStreamPtr privst = st->privateData; virNetClientStreamPtr privst = st->privateData;
@ -5862,7 +5862,7 @@ remoteStreamFinish(virStreamPtr st)
ret = virNetClientStreamSendPacket(privst, ret = virNetClientStreamSendPacket(privst,
priv->client, priv->client,
VIR_NET_OK, streamAbort ? VIR_NET_ERROR : VIR_NET_OK,
NULL, NULL,
0); 0);
@ -5880,38 +5880,17 @@ remoteStreamFinish(virStreamPtr st)
} }
static int
remoteStreamFinish(virStreamPtr st)
{
return remoteStreamCloseInt(st, false);
}
static int static int
remoteStreamAbort(virStreamPtr st) remoteStreamAbort(virStreamPtr st)
{ {
struct private_data *priv = st->conn->privateData; return remoteStreamCloseInt(st, true);
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--;
cleanup:
virNetClientRemoveStream(priv->client, privst);
virObjectUnref(privst);
st->privateData = NULL;
st->driver = NULL;
remoteDriverUnlock(priv);
return ret;
} }