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

cleanup: Kill usage of access(PATH, F_OK) in favor of virFileExists()

Browse Source 
Semantics of the libvirt helper are more clear. This change also allows
to clean up some pieces of code.
This commit is contained in:
Peter Krempa 2013-09-13 15:32:43 +02:00
parent d66e7ce616
commit 4baa8d7637
14 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openvz/openvz_conf.c
View File

@ -940,7 +940,7 @@ openvzLocateConfDir(void)
char *ret = NULL;
while (conf_dir_list[i]) {
if (!access(conf_dir_list[i], F_OK)) {
if (virFileExists(conf_dir_list[i])) {
ignore_value(VIR_STRDUP(ret, conf_dir_list[i]));
goto cleanup;
}

2
src/parallels/parallels_storage.c
View File

@ -362,7 +362,7 @@ static int parallelsFindVmVolumes(virStoragePoolObjPtr pool,
"DiskDescriptor", ".xml")))
goto cleanup;
if (access(diskDescPath, F_OK))
if (!virFileExists(diskDescPath))
continue;
/* here we know, that ent->d_name is a disk image directory */

4
src/qemu/qemu_capabilities.c
View File

@ -731,13 +731,13 @@ virQEMUCapsInitGuest(virCapsPtr caps,
if (!binary)
return 0;
if (access("/dev/kvm", F_OK) == 0 &&
if (virFileExists("/dev/kvm") &&
(virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KVM) ||
virQEMUCapsGet(qemubinCaps, QEMU_CAPS_ENABLE_KVM) ||
kvmbin))
haskvm = true;
if (access("/dev/kqemu", F_OK) == 0 &&
if (virFileExists("/dev/kqemu") &&
virQEMUCapsGet(qemubinCaps, QEMU_CAPS_KQEMU))
haskqemu = true;

6
src/qemu/qemu_cgroup.c
View File

@ -33,6 +33,7 @@
#include "domain_audit.h"
#include "virscsi.h"
#include "virstring.h"
#include "virfile.h"
#define VIR_FROM_THIS VIR_FROM_QEMU
@ -501,9 +502,8 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
}
for (i = 0; deviceACL[i] != NULL; i++) {
if (access(deviceACL[i], F_OK) < 0) {
VIR_DEBUG("Ignoring non-existant device %s",
deviceACL[i]);
if (!virFileExists(deviceACL[i])) {
VIR_DEBUG("Ignoring non-existant device %s", deviceACL[i]);
continue;
}

2
src/qemu/qemu_process.c
View File

@ -3632,7 +3632,7 @@ int qemuProcessStart(virConnectPtr conn,
if (vm->def->virtType == VIR_DOMAIN_VIRT_KVM) {
VIR_DEBUG("Checking for KVM availability");
if (access("/dev/kvm", F_OK) != 0) {
if (!virFileExists("/dev/kvm")) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Domain requires KVM, but it is not available. "
"Check that virtualization is enabled in the host BIOS, "

5
src/storage/storage_backend_fs.c
View File

@ -501,13 +501,12 @@ virStorageBackendFileSystemCheck(virConnectPtr conn ATTRIBUTE_UNUSED,
virStoragePoolObjPtr pool,
bool *isActive)
{
*isActive = false;
if (pool->def->type == VIR_STORAGE_POOL_DIR) {
if (access(pool->def->target.path, F_OK) == 0)
*isActive = true;
*isActive = virFileExists(pool->def->target.path);
#if WITH_STORAGE_FS
} else {
int ret;
*isActive = false;
if ((ret = virStorageBackendFileSystemIsMounted(pool)) != 0) {
if (ret < 0)
return -1;

2
src/storage/storage_backend_logical.c
View File

@ -453,7 +453,7 @@ virStorageBackendLogicalCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
virStoragePoolObjPtr pool,
bool *isActive)
{
*isActive = (access(pool->def->target.path, F_OK) == 0);
*isActive = virFileExists(pool->def->target.path);
return 0;
}

8
src/storage/storage_backend_mpath.c
View File

@ -287,13 +287,7 @@ virStorageBackendMpathCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
bool *isActive)
{
const char *path = "/dev/mpath";
*isActive = false;
if (access(path, F_OK) == 0)
*isActive = true;
*isActive = virFileExists("/dev/mpath");
return 0;
}

3
src/storage/storage_backend_scsi.c
View File

@ -700,8 +700,7 @@ virStorageBackendSCSICheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
if (virAsprintf(&path, "/sys/class/scsi_host/host%d", host) < 0)
goto cleanup;
if (access(path, F_OK) == 0)
*isActive = true;
*isActive = virFileExists(path);
ret = 0;
cleanup:

2
src/util/vircgroup.c
View File

@ -905,7 +905,7 @@ virCgroupMakeGroup(virCgroupPtr parent,
sa_assert(group->controllers[i].mountPoint);
VIR_DEBUG("Make controller %s", path);
if (access(path, F_OK) != 0) {
if (!virFileExists(path)) {
if (!create ||
mkdir(path, 0755) < 0) {
/* With a kernel that doesn't support multi-level directory

2
src/util/virfile.c
View File

@ -735,7 +735,7 @@ virFileNBDDeviceIsBusy(const char *devname)
devname) < 0)
return -1;
if (access(path, F_OK) < 0) {
if (!virFileExists(path)) {
if (errno == ENOENT)
ret = 0;
else

2
src/util/virpci.c
View File

@ -1501,7 +1501,7 @@ virPCIDeviceNew(unsigned int domain,
dev->name) < 0)
goto error;
if (access(dev->path, F_OK) != 0) {
if (!virFileExists(dev->path)) {
virReportSystemError(errno,
_("Device %s not found: could not access %s"),
dev->name, dev->path);

2
src/util/virscsi.c
View File

@ -216,7 +216,7 @@ virSCSIDeviceNew(const char *adapter,
virAsprintf(&dev->sg_path, "/dev/%s", sg) < 0)
goto cleanup;
if (access(dev->sg_path, F_OK) != 0) {
if (!virFileExists(dev->sg_path)) {
virReportSystemError(errno,
_("SCSI device '%s': could not access %s"),
dev->name, dev->sg_path);

6
src/util/virutil.c
View File

@ -1711,7 +1711,7 @@ virIsCapableFCHost(const char *sysfs_prefix,
host) < 0)
return false;
if (access(sysfs_path, F_OK) == 0)
if (virFileExists(sysfs_path))
ret = true;
VIR_FREE(sysfs_path);
@ -1740,8 +1740,8 @@ virIsCapableVport(const char *sysfs_prefix,
"vport_create") < 0)
goto cleanup;
if ((access(fc_host_path, F_OK) == 0) ||
(access(scsi_host_path, F_OK) == 0))
if (virFileExists(fc_host_path) ||
virFileExists(scsi_host_path))
ret = true;
cleanup: