External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

stream: Access stream->prog instead of a hard-coded global variable

Browse Source 
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 <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Marc Hartmayer 2018-03-08 13:20:38 +01:00 committed by John Ferlan
parent 9f24004b82
commit 8bd0261a72
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/remote/remote_daemon_stream.c
View File

@ -213,7 +213,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque)
msg->cb = daemonStreamMessageFinished; msg->cb = daemonStreamMessageFinished;
msg->opaque = stream; msg->opaque = stream;
stream->refs++; stream->refs++;
if (virNetServerProgramSendStreamData(remoteProgram, if (virNetServerProgramSendStreamData(stream->prog,
client, client,
msg, msg,
stream->procedure, stream->procedure,
@ -253,7 +253,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque)
if (!msg) { if (!msg) {
ret = -1; ret = -1;
} else { } else {
ret = virNetServerProgramSendStreamError(remoteProgram, ret = virNetServerProgramSendStreamError(stream->prog,
client, client,
msg, msg,
&rerr, &rerr,
@ -650,7 +650,7 @@ daemonStreamHandleAbort(virNetServerClientPtr client,
if (raise_error) { if (raise_error) {
virNetMessageError rerr; virNetMessageError rerr;
memset(&rerr, 0, sizeof(rerr)); memset(&rerr, 0, sizeof(rerr));
return virNetServerProgramSendReplyError(remoteProgram, return virNetServerProgramSendReplyError(stream->prog,
client, client,
msg, msg,
&rerr, &rerr,
@ -845,7 +845,7 @@ daemonStreamHandleRead(virNetServerClientPtr client,
VIR_DEBUG("rv=%d inData=%d length=%lld", rv, inData, length); VIR_DEBUG("rv=%d inData=%d length=%lld", rv, inData, length);
if (rv < 0) { if (rv < 0) {
if (virNetServerProgramSendStreamError(remoteProgram, if (virNetServerProgramSendStreamError(stream->prog,
client, client,
msg, msg,
&rerr, &rerr,
@ -862,7 +862,7 @@ daemonStreamHandleRead(virNetServerClientPtr client,
msg->cb = daemonStreamMessageFinished; msg->cb = daemonStreamMessageFinished;
msg->opaque = stream; msg->opaque = stream;
stream->refs++; stream->refs++;
if (virNetServerProgramSendStreamHole(remoteProgram, if (virNetServerProgramSendStreamHole(stream->prog,
client, client,
msg, msg,
stream->procedure, stream->procedure,
@ -893,7 +893,7 @@ daemonStreamHandleRead(virNetServerClientPtr client,
/* Should never get this, since we're only called when we know /* Should never get this, since we're only called when we know
* we're readable, but hey things change... */ * we're readable, but hey things change... */
} else if (rv < 0) { } else if (rv < 0) {
if (virNetServerProgramSendStreamError(remoteProgram, if (virNetServerProgramSendStreamError(stream->prog,
client, client,
msg, msg,
&rerr, &rerr,
@ -912,7 +912,7 @@ daemonStreamHandleRead(virNetServerClientPtr client,
msg->cb = daemonStreamMessageFinished; msg->cb = daemonStreamMessageFinished;
msg->opaque = stream; msg->opaque = stream;
stream->refs++; stream->refs++;
if (virNetServerProgramSendStreamData(remoteProgram, if (virNetServerProgramSendStreamData(stream->prog,
client, client,
msg, msg,
stream->procedure, stream->procedure,