[libvirt] [PATCH 1/4] 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(a)redhat.com>
---
tests/testutilsqemu.c | 4 +---
tests/testutilsqemu.h | 2 ++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 763f511bcf..0f295dc9a9 100644
--- 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 9ff34841ff..9ed633f8c0 100644
--- 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,
--
2.20.1