From: Daniel P. Berrangé <berrange@redhat.com>
Date: Wed, 16 Sep 2020 13:51:47 +0000 (+0100)
Subject: remote: slightly improve debugging of socket selection
X-Git-Tag: v6.8.0-rc1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a71e969b59e8e3bf9ccb981f50a9b9327cf1f40;p=thirdparty%2Flibvirt.git

remote: slightly improve debugging of socket selection

The current debug message reports the "mode" after selection has
completed, however, the "mode" value can be changed by the selection
logic. It is thus beneficial to report most values upfront, and only
report newly changed values at the end.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/remote/remote_sockets.c b/src/remote/remote_sockets.c
index 7c69ed9e7f..478c78edc2 100644
--- a/src/remote/remote_sockets.c
+++ b/src/remote/remote_sockets.c
@@ -145,6 +145,11 @@ remoteGetUNIXSocket(remoteDriverTransport transport,
     g_autofree char *direct_sock_name = NULL;
     g_autofree char *legacy_sock_name = NULL;
 
+    VIR_DEBUG("Choosing remote socket for transport=%s mode=%s driver=%s ro=%d session=%d",
+              remoteDriverTransportTypeToString(transport),
+              remoteDriverModeTypeToString(mode),
+              driver, ro, session);
+
     if (driver)
         direct_daemon = g_strdup_printf("virt%sd", driver);
 
@@ -208,12 +213,9 @@ remoteGetUNIXSocket(remoteDriverTransport transport,
         return NULL;
     }
 
-    VIR_DEBUG("Chosen UNIX sockname=%s daemon=%s "
-              "for mode=%s transport=%s ro=%d session=%d",
+    VIR_DEBUG("Chosen UNIX sockname=%s daemon=%s with mode=%s",
               sock_name, NULLSTR(*daemon),
-              remoteDriverModeTypeToString(mode),
-              remoteDriverTransportTypeToString(transport),
-              ro, session);
+              remoteDriverModeTypeToString(mode));
     return sock_name;
 }