From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 16 Apr 2019 10:22:31 +0000 (+0200)
Subject: tests: Make TEST_QEMU_CAPS_PATH public
X-Git-Tag: v5.3.0-rc1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0e48979c9b9add105fbfda96828f14e1ea18323;p=thirdparty%2Flibvirt.git

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 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,