From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 24 May 2021 10:06:23 +0000 (+0100)
Subject: remote: use absolute path to check for daemons
X-Git-Tag: v7.4.0-rc2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2db507ece59eb7a12a89fe379d46ec495c3258c4;p=thirdparty%2Flibvirt.git

remote: use absolute path to check for daemons

virFileFindResource needs to be given the absolute build path otherwise
its results will vary according to the CWD, leading to spurious failures
in dev testing.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 1b4f5256c3..13f76cc685 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -2001,7 +2001,9 @@ remoteDispatchProbeURI(bool readonly,
 
             daemonname = g_strdup_printf("virt%sd", drivers[i]);
 
-            if (!(daemonpath = virFileFindResource(daemonname, "src", SBINDIR)))
+            if (!(daemonpath = virFileFindResource(daemonname,
+                                                   abs_top_builddir "/src",
+                                                   SBINDIR)))
                 return -1;
 
             if (!virFileExists(daemonpath)) {