External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 21:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rename interop locations

Browse Source 
Use abstract names that more closely match the Meson
nomenclature.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Andrea Bolognani 2021-11-15 18:03:44 +01:00
parent b41c95af5b
commit c46c2e15d1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_interop_config.c
View File

@ -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 &&