From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 24 May 2021 13:58:12 +0000 (+0100)
Subject: remote: don't populate daemon path if autostart is not required
X-Git-Tag: v7.5.0-rc1~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46980c29ef7204ff566898dbca93acb470cb6fce;p=thirdparty%2Flibvirt.git

remote: don't populate daemon path if autostart is not required

When deciding what socket to connect to, we build the daemon path
that we need to autostart. This path only needs to be populated
if we actually intend to use autostart.

Reviewed-by: Ján Tomko <jtomko@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 6d33b69467..cce6703e75 100644
--- a/src/remote/remote_sockets.c
+++ b/src/remote/remote_sockets.c
@@ -232,12 +232,16 @@ remoteGetUNIXSocket(remoteDriverTransport transport,
         return NULL;
     }
 
-    if (!(*daemon_path = virFileFindResourceFull(daemon_name,
-                                                 NULL, NULL,
-                                                 abs_top_builddir "/src",
-                                                 SBINDIR,
-                                                 env_name)))
-        return NULL;
+    if (flags & REMOTE_DRIVER_OPEN_AUTOSTART) {
+        if (!(*daemon_path = virFileFindResourceFull(daemon_name,
+                                                     NULL, NULL,
+                                                     abs_top_builddir "/src",
+                                                     SBINDIR,
+                                                     env_name)))
+            return NULL;
+    } else {
+        *daemon_path = NULL;
+    }
 
     VIR_DEBUG("Chosen UNIX sockname=%s daemon_path=%s with mode=%s",
               sock_name, NULLSTR(*daemon_path),