[libvirt PATCH] tests: Enable directory override for qemucapsprobe

Andrea Bolognani abologna at redhat.com
Wed May 6 09:54:04 UTC 2020


Currently, qemucapsprobe fails when libvirt is not already installed
on the system:

  $ ./tests/qemucapsprobe /path/to/qemu-system-ppc64 >/dev/null
  I/O warning : failed to load external entity "/usr/share/libvirt/cpu_map/index.xml"
  2020-05-06 09:49:59.136+0000: 269822: info : libvirt version: 6.4.0
  2020-05-06 09:49:59.136+0000: 269822: info : hostname: [...]
  2020-05-06 09:49:59.136+0000: 269822: warning : virQEMUCapsLogProbeFailure:5127 :
  Failed to probe capabilities for /path/to/qemu-system-ppc64: XML error: failed to
  parse xml document '/usr/share/libvirt/cpu_map/index.xml'

It would be great if the tool could work entirely out of the build
directory, and this patch achieves just that.

Suggested-by: Peter Krempa <pkrempa at redhat.com>
Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 tests/qemucapsprobe.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c
index c7e8f3309d..ea88fd2e8a 100644
--- a/tests/qemucapsprobe.c
+++ b/tests/qemucapsprobe.c
@@ -55,6 +55,8 @@ main(int argc, char **argv)
 
     VIR_TEST_PRELOAD(mock);
 
+    virFileActivateDirOverrideForProg(argv[0]);
+
     if (argc != 2) {
         fprintf(stderr, "%s QEMU_binary\n", argv[0]);
         return EXIT_FAILURE;
-- 
2.25.4




More information about the libvir-list mailing list