tests: Make TEST_QEMU_CAPS_PATH public

The value (with a slightly different name) is currently private
to testutilsqemu, but since we use this path all over the place
it makes sense to define it publicly and avoid repetition.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 763f511bcf7ec665a42192b95a41c6af19bf49a3..0f295dc9a9d32e4d348e9a6ae10bc3d97af77fed 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -957,8 +957,6 @@ testQemuCapsIterate(const char *dirname,
 }
 
 
-#define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata"
-
 int
 testQemuInfoSetArgs(struct testQemuInfo *info,
                     virHashTablePtr capslatest, ...)
@@ -1059,7 +1057,7 @@ testQemuInfoSetArgs(struct testQemuInfo *info,
                 goto cleanup;
             stripmachinealiases = true;
         } else if (virAsprintf(&capsfile, "%s/caps_%s.%s.xml",
-                               TEST_CAPS_PATH, capsver, capsarch) < 0) {
+                               TEST_QEMU_CAPS_PATH, capsver, capsarch) < 0) {
             goto cleanup;
         }
 

diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
index 9ff34841ff6c1a81ac91ad1497c3a01d182c0506..9ed633f8c02117d815aba1c11e7932400fcb03e3 100644 (file)
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -25,6 +25,8 @@
 #  include "qemu/qemu_capabilities.h"
 #  include "qemu/qemu_conf.h"
 
+#  define TEST_QEMU_CAPS_PATH abs_srcdir "/qemucapabilitiesdata"
+
 enum {
     GIC_NONE = 0,
     GIC_V2,