[libvirt PATCH 3/5] qemu: Rename interop locations

Use abstract names that more closely match the Meson nomenclature. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- src/qemu/qemu_interop_config.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index fe1bd44b41..d3f1f34ecf 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -80,8 +80,8 @@ qemuBuildFileList(GHashTable *files, const char *dir) return 0; } -#define QEMU_SYSTEM_LOCATION DATADIR "/qemu" -#define QEMU_ETC_LOCATION SYSCONFDIR "/qemu" +#define QEMU_DATADIR DATADIR "/qemu" +#define QEMU_CONFDIR SYSCONFDIR "/qemu" int qemuInteropFetchConfigs(const char *name, @@ -91,8 +91,8 @@ qemuInteropFetchConfigs(const char *name, g_autoptr(GHashTable) files = virHashNew(g_free); g_autofree char *homeConfig = NULL; g_autofree char *xdgConfig = NULL; - g_autofree char *sysLocation = virFileBuildPath(QEMU_SYSTEM_LOCATION, name, NULL); - g_autofree char *etcLocation = virFileBuildPath(QEMU_ETC_LOCATION, name, NULL); + g_autofree char *dataLocation = virFileBuildPath(QEMU_DATADIR, name, NULL); + g_autofree char *confLocation = virFileBuildPath(QEMU_CONFDIR, name, NULL); g_autofree virHashKeyValuePair *pairs = NULL; size_t npairs; virHashKeyValuePair *tmp = NULL; @@ -117,10 +117,10 @@ qemuInteropFetchConfigs(const char *name, homeConfig = g_strdup_printf("%s/qemu/%s", xdgConfig, name); } - if (qemuBuildFileList(files, sysLocation) < 0) + if (qemuBuildFileList(files, dataLocation) < 0) return -1; - if (qemuBuildFileList(files, etcLocation) < 0) + if (qemuBuildFileList(files, confLocation) < 0) return -1; if (homeConfig && -- 2.31.1