diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 187aaf5737..f545d0b888 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -77,8 +77,6 @@ # include #endif -#include "dosname.h" - #define QEMU_QXL_VGAMEM_DEFAULT 16 * 1024 #define VIR_FROM_THIS VIR_FROM_QEMU @@ -14340,7 +14338,7 @@ qemuDomainCreateDeviceRecursive(const char *device, * (want /dev/disk/by-id/../../sda) * /dev/stdout -> /proc/self/fd/1 (no change needed) */ - if (IS_RELATIVE_FILE_NAME(target)) { + if (!g_path_is_absolute(target)) { char *c = NULL, *tmp = NULL, *devTmp = NULL; devTmp = g_strdup(device); @@ -15312,7 +15310,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, return ret; } - if (IS_RELATIVE_FILE_NAME(target)) { + if (!g_path_is_absolute(target)) { char *c = NULL, *tmp = NULL, *fileTmp = NULL; fileTmp = g_strdup(file); diff --git a/src/util/virfile.c b/src/util/virfile.c index 97f86a46e9..1ce909b033 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1562,7 +1562,7 @@ virFileResolveLinkHelper(const char *linkpath, /* We don't need the full canonicalization of intermediate * directories, if linkpath is absolute and the basename is * already a non-symlink. */ - if (IS_ABSOLUTE_FILE_NAME(linkpath) && !intermediatePaths) { + if (g_path_is_absolute(linkpath) && !intermediatePaths) { if (g_lstat(linkpath, &st) < 0) return -1; @@ -1640,7 +1640,7 @@ virFindFileInPath(const char *file) /* if we are passed an absolute path (starting with /), return a * copy of that path, after validating that it is executable */ - if (IS_ABSOLUTE_FILE_NAME(file)) { + if (g_path_is_absolute(file)) { if (!virFileIsExecutable(file)) return NULL;