Fix virConnect(Un)RegisterCloseCallback and get rid of global variables

[libvirt] [PATCH 15/20] stream: Access stream->prog instead of a hard-coded global variable

Posted by Marc Hartmayer 7 years, 9 months ago

Use stream->prog instead of a hard-coded
virNetServerProgram. 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>
---
 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 4dd3af9e0d59..21f0ecd53844 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,
@@ -644,7 +644,7 @@ daemonStreamHandleAbort(virNetServerClientPtr client,
     if (raise_error) {
         virNetMessageError rerr;
         memset(&rerr, 0, sizeof(rerr));
-        return virNetServerProgramSendReplyError(remoteProgram,
+        return virNetServerProgramSendReplyError(stream->prog,
                                                  client,
                                                  msg,
                                                  &rerr,
@@ -839,7 +839,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,
@@ -856,7 +856,7 @@ daemonStreamHandleRead(virNetServerClientPtr client,
                 msg->cb = daemonStreamMessageFinished;
                 msg->opaque = stream;
                 stream->refs++;
-                if (virNetServerProgramSendStreamHole(remoteProgram,
+                if (virNetServerProgramSendStreamHole(stream->prog,
                                                       client,
                                                       msg,
                                                       stream->procedure,
@@ -887,7 +887,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,
@@ -906,7 +906,7 @@ daemonStreamHandleRead(virNetServerClientPtr client,
         msg->cb = daemonStreamMessageFinished;
         msg->opaque = stream;
         stream->refs++;
-        if (virNetServerProgramSendStreamData(remoteProgram,
+        if (virNetServerProgramSendStreamData(stream->prog,
                                               client,
                                               msg,
                                               stream->procedure,
-- 
2.13.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 15/20] stream: Access stream->prog instead of a hard-coded global variable

Posted by John Ferlan 7 years, 9 months ago


On 03/08/2018 07:20 AM, Marc Hartmayer wrote:
> Use stream->prog instead of a hard-coded
> virNetServerProgram. Especially since these functions are intended as
> generic helpers for streams.

Looks like you were editing your commit message and didn't reformat.  In
essence though it seems you're making sure to use stream->prog instead
of the hard coded "remoteProgram" that "we know" is used when the stream
was created in daemonCreateClientStream.

Is that about right?

> 
> 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>
> ---
>  src/remote/remote_daemon_stream.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 

Reviewed-by: John Ferlan <jferlan@redhat.com>

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 15/20] stream: Access stream->prog instead of a hard-coded global variable

Posted by Marc Hartmayer 7 years, 9 months ago

On Thu, Mar 15, 2018 at 04:22 PM +0100, John Ferlan <jferlan@redhat.com> wrote:
> On 03/08/2018 07:20 AM, Marc Hartmayer wrote:
>> Use stream->prog instead of a hard-coded
>> virNetServerProgram. Especially since these functions are intended as
>> generic helpers for streams.
>
> Looks like you were editing your commit message and didn't reformat.  In
> essence though it seems you're making sure to use stream->prog instead
> of the hard coded "remoteProgram" that "we know" is used when the stream
> was created in daemonCreateClientStream.
>
> Is that about right?

Yep. At least for all callers of 'daemonCreateClientStream' I’ve
found. It might be useful to document the “we know” somewhere… :)

With this change it’s definitely easier to understand the code and the
daemonStream* functions can now be reused (if they’re needed somewhere).

>
>>
>> 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>
>> ---
>>  src/remote/remote_daemon_stream.c | 14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>
>
> Reviewed-by: John Ferlan <jferlan@redhat.com>
>
> John
>
--
Beste Grüße / Kind regards
   Marc Hartmayer

IBM Deutschland Research & Development GmbH
Vorsitzende des Aufsichtsrats: Martina Koederitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list