From 8bd0261a72fa0100812a37e23e5ca2a6685fb2df Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Thu, 8 Mar 2018 13:20:38 +0100 Subject: [PATCH] stream: Access stream->prog instead of a hard-coded global variable Use stream->prog instead of a hard-coded "remoteProgram" since at stream creation in daemonCreateClientStream "remoteProgram" is used so we should use that especially since these functions are intended as generic helpers for streams. Signed-off-by: Marc Hartmayer Reviewed-by: Bjoern Walk Reviewed-by: Boris Fiuczynski Reviewed-by: John Ferlan --- src/remote/remote_daemon_stream.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 14472ced22..38d50d1d1c 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -213,7 +213,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque) msg->cb = daemonStreamMessageFinished; msg->opaque = stream; stream->refs++; - if (virNetServerProgramSendStreamData(remoteProgram, + if (virNetServerProgramSendStreamData(stream->prog, client, msg, stream->procedure, @@ -253,7 +253,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque) if (!msg) { ret = -1; } else { - ret = virNetServerProgramSendStreamError(remoteProgram, + ret = virNetServerProgramSendStreamError(stream->prog, client, msg, &rerr, @@ -650,7 +650,7 @@ daemonStreamHandleAbort(virNetServerClientPtr client, if (raise_error) { virNetMessageError rerr; memset(&rerr, 0, sizeof(rerr)); - return virNetServerProgramSendReplyError(remoteProgram, + return virNetServerProgramSendReplyError(stream->prog, client, msg, &rerr, @@ -845,7 +845,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, VIR_DEBUG("rv=%d inData=%d length=%lld", rv, inData, length); if (rv < 0) { - if (virNetServerProgramSendStreamError(remoteProgram, + if (virNetServerProgramSendStreamError(stream->prog, client, msg, &rerr, @@ -862,7 +862,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, msg->cb = daemonStreamMessageFinished; msg->opaque = stream; stream->refs++; - if (virNetServerProgramSendStreamHole(remoteProgram, + if (virNetServerProgramSendStreamHole(stream->prog, client, msg, stream->procedure, @@ -893,7 +893,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, /* Should never get this, since we're only called when we know * we're readable, but hey things change... */ } else if (rv < 0) { - if (virNetServerProgramSendStreamError(remoteProgram, + if (virNetServerProgramSendStreamError(stream->prog, client, msg, &rerr, @@ -912,7 +912,7 @@ daemonStreamHandleRead(virNetServerClientPtr client, msg->cb = daemonStreamMessageFinished; msg->opaque = stream; stream->refs++; - if (virNetServerProgramSendStreamData(remoteProgram, + if (virNetServerProgramSendStreamData(stream->prog, client, msg, stream->procedure,